into sinisa.nasamreza.org:/mnt/work/mysql

  Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout


innobase/row/row0mysql.c:
  Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout

into sinisa.nasamreza.org:/mnt/work/mysql

into sergbook.mysql.com:/usr/home/serg/Abk/mysql

Will be properly fixed in 4.1 and 5.0


sql/field.h:
  Removed wrong (not used code)
sql/item_cmpfunc.cc:
  Removed wrong bug fix for problem with timestamp and BETWEEN.

Docs/manual.texi:
  ChangeLog
sql/mysqld.cc:
  Write info about writing core file to stderr

  Backport from 4.0: Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX
pars0grm.y:
  Move inclusion of math.h after univ.i also in the .y file; this fix is already done in 4.0


innobase/pars/pars0grm.y:
  Move inclusion of math.h after univ.i also in the .y file; this fix is already done in 4.0
sql/ha_innobase.cc:
  Backport from 4.0: Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX

   column with timestamp values with BETWEEN clause

 - Do-compile: fix small (cosmetical, not critical) typo


Build-tools/Do-compile:
   - added a fast test run with dynamic-row tables
   - fix small (cosmetical, not critical) typo

into mysql.com:/home/nick/mysql/mysql-3.23


sql/mysqld.cc:
  Auto merged

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~9d3403dbb31de075:
  'Auto converge rename'

BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Include univ.i before any system headers to remove a large file compilation failure on AIX


innobase/pars/pars0grm.c:
  Include univ.i before any system headers to remove a large file compilation failure on AIX
innobase/pars/lexyy.c:
  Include univ.i before any system headers to remove a large file compilation failure on AIX

into mysql.com:/space/my/mysql-3.23

Docs/manual.texi:
  ChangeLog
mysql-test/t/bdb-crash.test:
  Don't run test if BDB is not configured
sql/sql_base.cc:
  Added free on error

   necessary (required to actually pass the sql-bench without aborting
   with "table space full")


Build-tools/Do-compile:
   - Enable InnoDB to autoextend the table space if necessary (required to
     actually pass the sql-bench without aborting with "table space full")

   -p option for cp and the -r option for scp (thank to Paul DuBois for
   the patch)
 - fixed a typo

BitKeeper/etc/skipkeys:
  auto add
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysys/my_init.c:
  Auto merged

scripts/mysql_convert_table_format.sh:
   - fixed typo (spotted by Engin Gunduz)

sql/mysqld.cc:
   - fixed typo: "agaist" -> "against"

mysys/my_init.c:
  Fix the TZ variable bug: 100% CPU usage
sql/mysqld.cc:
  Added optional NT service
sql/nt_servc.cc:
  Added optional NT service
sql/nt_servc.h:
  Added optional NT service

Docs/manual.texi:
  ChangeLog
sql/field.h:
  New virtual function to set a field to null or signal an error
sql/field_conv.cc:
  New function to set a field to null or signal an error
sql/item.cc:
  When setting a field to null internally (for WHERE testing) don't autoconvert NULL -> now() or last_insert_id()
sql/item.h:
  New virtual function to set a field to null or signal an error

  Fix typo in earlier commit


innobase/btr/btr0cur.c:
  Fix typo in earlier commit

  Fix bug: range estimator exaggerated small range size greatly if the paths in the B-tree happened to branch on a high level


innobase/btr/btr0cur.c:
  Fix bug: range estimator exaggerated small range size greatly if the paths in the B-tree happened to branch on a high level

into mysql.com:/space/my/mysql-3.23