mysql-test/t/subselect.test:
  after merging fix
sql/sql_lex.cc:
  after merging fix
sql/sql_update.cc:
  after merging fix
sql/sql_yacc.yy:
  after merging fix

sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/work-lock-4.1

sql/sql_lex.cc:
  note about methods location

  Modification to new API test
sql_prepare.cc:
  Fix for lock_types


sql/sql_prepare.cc:
  Fix for lock_types
tests/client_test.c:
  Modification to new API test

  fix merge conflict


libmysql/libmysql.c:
  fix merge conflict

libmysql/libmysql.c:
  merge .

libmysql/errmsg.c:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_error.cc:
  Auto merged

scripts we don't need commented out
s_dir script for creating directories bdb build process requires


BitKeeper/deleted/.del-BerkeleyDB.wpj~a2a0abe09f33bb61:
  Delete: bdb/build_vxworks/BerkeleyDB.wpj
BitKeeper/deleted/.del-Makefile.custom~2b8f324317bef7ad:
  Delete: bdb/build_vxworks/BerkeleyDB/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~683fd022553cf846:
  Delete: bdb/build_vxworks/db_archive/db_archive/Makefile.custom
BitKeeper/deleted/.del-component.cdf~42d5e09d10a4debd:
  Delete: bdb/build_vxworks/BerkeleyDB/component.cdf
BitKeeper/deleted/.del-component.cdf~7713d5d32b01239:
  Delete: bdb/build_vxworks/db_archive/db_archive/component.cdf
BitKeeper/deleted/.del-component.wpj~13c8b25bc88a79a5:
  Delete: bdb/build_vxworks/BerkeleyDB/component.wpj
BitKeeper/deleted/.del-component.wpj~8f2eae1d43fc8a33:
  Delete: bdb/build_vxworks/db_archive/db_archive/component.wpj
BitKeeper/deleted/.del-db_archive.c~aa2f07eacf30fed:
  Delete: bdb/build_vxworks/db_archive/db_archive.c
BitKeeper/deleted/.del-db_archive.wpj~9b2944550502e15:
  Delete: bdb/build_vxworks/db_archive/db_archive.wpj
BitKeeper/deleted/.del-db_checkpoint.c~9a0937113e3c2aaa:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint.c
BitKeeper/deleted/.del-Makefile.custom~1cc8c2668b709944:
  Delete: bdb/build_vxworks/db_load/db_load/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~37a5b23498b0cb1b:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~6698b0966cb9896e:
  Delete: bdb/build_vxworks/db_dump/db_dump/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~e2919df8b5a5d18:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/Makefile.custom
BitKeeper/deleted/.del-component.cdf~88d94c29a18784f3:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock/component.cdf
BitKeeper/deleted/.del-component.cdf~acf828ccb25f2e7a:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/component.cdf
BitKeeper/deleted/.del-component.cdf~cbedb82f353d0922:
  Delete: bdb/build_vxworks/db_load/db_load/component.cdf
BitKeeper/deleted/.del-component.cdf~d2507fbdc31adf16:
  Delete: bdb/build_vxworks/db_dump/db_dump/component.cdf
BitKeeper/deleted/.del-component.wpj~5f1cc866f2597c5b:
  Delete: bdb/build_vxworks/db_dump/db_dump/component.wpj
BitKeeper/deleted/.del-component.wpj~7bbc0dcd2221ac89:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint/component.wpj
BitKeeper/deleted/.del-component.wpj~dda5a2a73736e0f9:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock/component.wpj
BitKeeper/deleted/.del-db_checkpoint.wpj~c11939cdaad080:
  Delete: bdb/build_vxworks/db_checkpoint/db_checkpoint.wpj
BitKeeper/deleted/.del-db_config.h~f0ffd61a4c4dcc10:
  Delete: bdb/build_vxworks/db_config.h
BitKeeper/deleted/.del-db_deadlock.c~b110945da1356bd3:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock.c
BitKeeper/deleted/.del-db_deadlock.wpj~b8617495863e87b3:
  Delete: bdb/build_vxworks/db_deadlock/db_deadlock.wpj
BitKeeper/deleted/.del-db_dump.c~aa0bdb027bcc79:
  Delete: bdb/build_vxworks/db_dump/db_dump.c
BitKeeper/deleted/.del-db_dump.wpj~7e28dd5799ef9d7:
  Delete: bdb/build_vxworks/db_dump/db_dump.wpj
BitKeeper/deleted/.del-db_load.c~1dd647c9c5863378:
  Delete: bdb/build_vxworks/db_load/db_load.c
BitKeeper/deleted/.del-db_load.wpj~67c6c653a9bea870:
  Delete: bdb/build_vxworks/db_load/db_load.wpj
BitKeeper/deleted/.del-Makefile.custom~1a5a0a49a86a3f28:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~afc05029de4bf10:
  Delete: bdb/build_vxworks/db_printlog/db_printlog/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~b56acb71917c4d78:
  Delete: bdb/build_vxworks/db_recover/db_recover/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~ead532061f2a01a7:
  Delete: bdb/build_vxworks/db_stat/db_stat/Makefile.custom
BitKeeper/deleted/.del-component.cdf~169be941a9ccfe77:
  Delete: bdb/build_vxworks/db_printlog/db_printlog/component.cdf
BitKeeper/deleted/.del-component.cdf~41e8ac6e554a2c0a:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade/component.cdf
BitKeeper/deleted/.del-component.cdf~8dfd6cea1eb16ffb:
  Delete: bdb/build_vxworks/db_recover/db_recover/component.cdf
BitKeeper/deleted/.del-component.cdf~c6f1a7b0c99c5a:
  Delete: bdb/build_vxworks/db_stat/db_stat/component.cdf
BitKeeper/deleted/.del-component.wpj~2b0236f9e7d93c0e:
  Delete: bdb/build_vxworks/db_load/db_load/component.wpj
BitKeeper/deleted/.del-component.wpj~65b35a15fb66fbf4:
  Delete: bdb/build_vxworks/db_recover/db_recover/component.wpj
BitKeeper/deleted/.del-component.wpj~ab56c607b6f675f0:
  Delete: bdb/build_vxworks/db_printlog/db_printlog/component.wpj
BitKeeper/deleted/.del-component.wpj~b569f98cbb9764e4:
  Delete: bdb/build_vxworks/db_stat/db_stat/component.wpj
BitKeeper/deleted/.del-db_printlog.c~577c296df84c5d5e:
  Delete: bdb/build_vxworks/db_printlog/db_printlog.c
BitKeeper/deleted/.del-db_printlog.wpj~a3d309da1bcfd90d:
  Delete: bdb/build_vxworks/db_printlog/db_printlog.wpj
BitKeeper/deleted/.del-db_recover.c~91a305ab726bdd8:
  Delete: bdb/build_vxworks/db_recover/db_recover.c
BitKeeper/deleted/.del-db_recover.wpj~8ad42e5de67901e2:
  Delete: bdb/build_vxworks/db_recover/db_recover.wpj
BitKeeper/deleted/.del-db_stat.c~4dcfe3213db403f7:
  Delete: bdb/build_vxworks/db_stat/db_stat.c
BitKeeper/deleted/.del-db_stat.wpj~77f17910b9a94f85:
  Delete: bdb/build_vxworks/db_stat/db_stat.wpj
BitKeeper/deleted/.del-db_upgrade.c~e7cda8f222da34a7:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade.c
BitKeeper/deleted/.del-db_upgrade.wpj~d36d961b31f59dda:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade.wpj
BitKeeper/deleted/.del-Makefile.custom~885ead3079a0a779:
  Delete: bdb/build_vxworks/db_verify/db_verify/Makefile.custom
BitKeeper/deleted/.del-Makefile.custom~a1a4e96924c2bc16:
  Delete: bdb/build_vxworks/dbdemo/dbdemo/Makefile.custom
BitKeeper/deleted/.del-component.cdf~4e48fb1399b97382:
  Delete: bdb/build_vxworks/dbdemo/dbdemo/component.cdf
BitKeeper/deleted/.del-component.cdf~7949208c42787c23:
  Delete: bdb/build_vxworks/db_verify/db_verify/component.cdf
BitKeeper/deleted/.del-component.wpj~33b7238376fc4675:
  Delete: bdb/build_vxworks/db_verify/db_verify/component.wpj
BitKeeper/deleted/.del-component.wpj~94039e6651ac117:
  Delete: bdb/build_vxworks/db_upgrade/db_upgrade/component.wpj
BitKeeper/deleted/.del-component.wpj~b4f7a191ebb2b1e7:
  Delete: bdb/build_vxworks/dbdemo/dbdemo/component.wpj
BitKeeper/deleted/.del-db_verify.c~1b3e9cc5c17323eb:
  Delete: bdb/build_vxworks/db_verify/db_verify.c
BitKeeper/deleted/.del-db_verify.wpj~1fa472e1eeecb396:
  Delete: bdb/build_vxworks/db_verify/db_verify.wpj
BitKeeper/deleted/.del-dbdemo.c~e754acbbacde488:
  Delete: bdb/build_vxworks/dbdemo/dbdemo.c
BitKeeper/deleted/.del-dbdemo.wpj~c8d2fa5d14674437:
  Delete: bdb/build_vxworks/dbdemo/dbdemo.wpj
bdb/dist/s_all:
  move mkdir stuff to a separate file
  comment out scripts we don't need

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

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

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

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

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

  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 sinisa.nasamreza.org:/mnt/work/mysql-4.1

into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb

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

select sql_calc_found_rows * from table limit 0;
It does ...

  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

into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb

  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

into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1