configure.in:
  Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_func.h:
  Merge

Compatibility syntax: SERIAL, [PRIMARY] KEY and VALUE



sql/sql_lex.cc:
  Faster handling of identifiers
sql/sql_lex.h:
  Faster handling of identifiers
sql/sql_yacc.yy:
  Added SERIAL (alias for bigint auto_increment)
  Make PRIMARY optional in field specification
  Make VALUE alias for VALUES

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)

sql-bench/server-cfg.sh:
  Auto merged

mysql-test/r/heap_btree.result:
  Updated results
mysql-test/r/heap_hash.result:
  Updated results
mysql-test/r/merge.result:
  Updated results
mysql-test/r/rpl_log.result:
  Updated results
mysql-test/r/select.result:
  Updated results
mysql-test/r/subselect.result:
  Updated results
sql/item_cmpfunc.h:
  Fix after merge
sql/log_event.cc:
  Fix after merge
sql/mysql_priv.h:
  Fix after merge
sql/sql_acl.cc:
  Fix after merge
sql/sql_class.cc:
  Fix after merge
sql/sql_db.cc:
  Fix after merge
sql/sql_delete.cc:
  Fix after merge
sql/sql_lex.cc:
  Fix after merge
sql/sql_lex.h:
  Fix after merge
sql/sql_parse.cc:
  Fix after merge
sql/sql_update.cc:
  Fix after merge
sql/sql_yacc.yy:
  Fix after merge

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

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

into mysql.com:/home/walrus/bk/41

sql-bench/server-cfg.sh:
  Add sapdb section

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

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Auto merged
BitKeeper/etc/config:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/myisam.h:
  Auto merged
include/violite.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hash_filo.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/ha_myisam.cc:
  Merge with 4.0
  Removed some commented code
sql/sql_db.cc:
  Merge with 4.0
  Optimized the logging of the drop db call a bit
sql/sql_update.cc:
  Added comment

innobase/row/row0mysql.c:
  Auto merged

New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0


include/mysqld_error.h:
  New warning message
mysql-test/r/func_system.result:
  Added testing of new functions
mysql-test/r/func_test.result:
  Added testing of new functions
mysql-test/r/type_blob.result:
  Added testing of new functions
mysql-test/t/func_system.test:
  Added testing of new functions
mysql-test/t/func_test.test:
  Added testing of new functions
mysql-test/t/type_blob.test:
  Added testing of new functions
sql/item_func.cc:
  Added function DIV
sql/item_func.h:
  Added function DIV
sql/lex.h:
  New keywords
sql/share/czech/errmsg.txt:
  New warning message
sql/share/danish/errmsg.txt:
  New warning message
sql/share/dutch/errmsg.txt:
  New warning message
sql/share/english/errmsg.txt:
  New warning message
sql/share/estonian/errmsg.txt:
  New warning message
sql/share/french/errmsg.txt:
  New warning message
sql/share/german/errmsg.txt:
  New warning message
sql/share/greek/errmsg.txt:
  New warning message
sql/share/hungarian/errmsg.txt:
  New warning message
sql/share/italian/errmsg.txt:
  New warning message
sql/share/japanese/errmsg.txt:
  New warning message
sql/share/korean/errmsg.txt:
  New warning message
sql/share/norwegian-ny/errmsg.txt:
  New warning message
sql/share/norwegian/errmsg.txt:
  New warning message
sql/share/polish/errmsg.txt:
  New warning message
sql/share/portuguese/errmsg.txt:
  New warning message
sql/share/romanian/errmsg.txt:
  New warning message
sql/share/russian/errmsg.txt:
  New warning message
sql/share/serbian/errmsg.txt:
  New warning message
sql/share/slovak/errmsg.txt:
  New warning message
sql/share/spanish/errmsg.txt:
  New warning message
sql/share/swedish/errmsg.txt:
  New warning message
  Translated a lot of error messages
sql/share/ukrainian/errmsg.txt:
  New warning message
sql/sql_class.cc:
  Added support for warnings during parsing
sql/sql_class.h:
  Added support for warnings during parsing
sql/sql_error.cc:
  Added support for warnings during parsing
sql/sql_lex.cc:
  Fixed comment
sql/sql_parse.cc:
  Added automatic conversion from CHAR(length) to BLOB when length > 255
  Added support for BLOB(length)
sql/sql_yacc.yy:
  New operators MOD and DIV
  SELECT ... FROM DUAL
  TRUE = 1 and FALSE = 0

 - 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

libmysql/libmysql.c:
  Removed ^M from source
libmysqld/libmysqld.c:
  Added handling of protocol options (to get source to compile)
sql/lex.h:
  Added compabitlity keywords
sql/mysql_priv.h:
  Added compatibility modes
sql/mysqld.cc:
  Added compatibility modes
sql/sql_delete.cc:
  Cleaned up SAFE_UPDATES handling
sql/sql_yacc.yy:
  Added compatibility modes

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