sql/opt_range.cc:
  Auto merged

Build-tools/Do-compile:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Ignore changes from 3.23
mysql-test/r/func_time.result:
  Update results
mysql-test/r/null_key.result:
  Update results
scripts/mysqld_safe.sh:
  Don't apply NICE handling change from 3.23
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
support-files/mysql.server.sh:
  Don't apply changes from 3.23

Added CEIL as an alias for CEILING
Cleaned up CHECK constraint handling.
(We don't anymore require braces after CHECK)
Added casting to CHAR.


mysql-test/r/bigint.result:
  Moved casting test to cast.test
mysql-test/r/func_time.result:
  Test of new functions
mysql-test/t/bigint.test:
  Moved casting test to cast.test
mysql-test/t/func_time.test:
  Test of new functions
sql/item_create.cc:
  Added casting to CHAR
sql/item_func.h:
  Added casting to CHAR
sql/item_timefunc.h:
  Added casting to CHAR
sql/lex.h:
  Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
  Added CEIL as an alias for CEILING
sql/sql_yacc.yy:
  Cleaned up CHECK constraint handling.

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

     - fix setting of niceness level

support-files/mysql.server.sh
     - applied some fixes from 4.0 mysql.server script
     - fix my.cnf parsing


scripts/safe_mysqld.sh:
   - fix setting of niceness level, if one adds "renice -20 $$" to safe_mysqld
     as hinted in the manual (which could result in NOHUP_NICENESS having a
     value of "-15" and hence there would be one dash too much)
support-files/mysql.server.sh:
   - applied some fixes from 4.0 mysql.server script
   - fix to actually parse the documented section ([mysql.server] not
     [mysql_server]) in my.cnf on startup

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

  Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log


innobase/ut/ut0mem.c:
  Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log

sql/mysqld.cc:
  Auto merged

Fix for Mac OS X shutdown


mysql-test/mysql-test-run.sh:
  Log client error messages
mysql-test/r/null_key.result:
  Test for bug in <=> NULL
mysql-test/t/null_key.test:
  Test for bug in <=> NULL
sql/mysqld.cc:
  Fix for Mac OS X shutdown
sql/opt_range.cc:
  Fixed bug with indexed NULL column <=> NULL

into sanja.is.com.ua:/home/bell/mysql/mysql-4.0

excluded double call of 'invalidate()'


mysql-test/r/innodb_cache.result:
  test of invalidation
mysql-test/t/innodb_cache.test:
  test of invalidation
sql/handler.cc:
  excluded double call of 'invalidate()'
sql/sql_delete.cc:
  fixed invalidation of query cache
sql/sql_insert.cc:
  fixed invalidation of query cache
sql/sql_update.cc:
  fixed invalidation of query cache

 - actually follow the hints in the comment above and "Remember that 
   regexps needs to quote [ and ] since this is run through m4"...


configure.in:
   - actually follow the hints in the comment above and "Remember that 
     regexps needs to quote [ and ] since this is run through m4"...

 - fix MYSQL_NO_DASH_VERSION if version number ends on one digit only
   ("comment" test failed when MySQL version was changed from 4.0.5
   to 4.0.5a)


configure.in:
   - fix MYSQL_NO_DASH_VERSION if version number ends on one digit only
     ("comment" test failed when MySQL version was changed from 4.0.5
     to 4.0.5a)

delete from table where column<=>NULL 
on indexed columns

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

mysql-test/r/func_test.result:
  Fixing the error in result

innobase/row/row0mysql.c:
  Auto merged

 - applied some changes from the 4.0 tree (enable multiple 
   --conf-environment options, add --with-debug, don't add "-max"
   prefix just because BDB is enabled)


Build-tools/Do-compile:
   - applied some changes from the 4.0 tree (enable multiple 
     --conf-environment options, add --with-debug, don't add "-max"
     prefix just because BDB is enabled)

Fix for shutdown on Mac OS X


include/my_tree.h:
  Try to optimize the cache buffer size needed for bulk_insert
myisam/mi_write.c:
  Try to optimize the cache buffer size needed for bulk_insert
mysql-test/r/bdb.result:
  Make test repeatable
mysql-test/t/bdb.test:
  Make test repeatable
mysys/tree.c:
  Try to optimize the cache buffer size needed for bulk_insert
sql/mysql_priv.h:
  Small optimization
sql/mysqld.cc:
  Fix for shutdown on Mac OS X
sql/sql_insert.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/sql_yacc.yy:
  Call thd->strmake() instead of sql_strmake()
sql/table.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/table.h:
  Try to optimize the cache buffer size needed for bulk_insert

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

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

  Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them


sql/set_var.cc:
  Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them

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

  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table


sql/ha_innobase.cc:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table


innobase/include/row0mysql.h:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
innobase/row/row0mysql.c:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp


sql/handler.h:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
sql/sql_table.cc:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
sql/ha_innodb.cc:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
innobase/include/row0mysql.h:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
innobase/row/row0mysql.c:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

   (thanks to Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>


bdb/dist/aclocal/mutex.m4:
   - applied patch for AMD x86-64

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-depcomp:
  Delete: depcomp
config.guess:
  Auto merged
config.sub:
  Auto merged
configure.in:
  Auto merged
dbug/Makefile.am:
  Auto merged
heap/Makefile.am:
  Auto merged
install-sh:
  Auto merged
isam/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ltconfig:
  Auto merged
ltmain.sh:
  Auto merged
missing:
  Auto merged
myisam/Makefile.am:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
regex/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged

into genie.(none):/home/vva/work/mysqldump_xml/4.0

client/mysqldump.c:
  fix xml-output