BitKeeper/deleted/.del-README~281c91deea8d9cf7:
  Delete: bdb/examples_c/README
BitKeeper/deleted/.del-bench_001.c~2fa9b35498dae603:
  Delete: bdb/examples_c/bench_001.c
BitKeeper/deleted/.del-ex_access.c~75506e56e42fa9d4:
  Delete: bdb/examples_c/ex_access.c
BitKeeper/deleted/.del-ex_btrec.c~1dd4f24b6baa62a5:
  Delete: bdb/examples_c/ex_btrec.c
BitKeeper/deleted/.del-ex_dbclient.c~9560845efc4dcf01:
  Delete: bdb/examples_c/ex_dbclient.c
BitKeeper/deleted/.del-ex_env.c~b2fbf8debefbb955:
  Delete: bdb/examples_c/ex_env.c
BitKeeper/deleted/.del-ex_lock.c~6b6f72e8b19da0b1:
  Delete: bdb/examples_c/ex_lock.c
BitKeeper/deleted/.del-ex_mpool.c~b51c929ad09f2cb8:
  Delete: bdb/examples_c/ex_mpool.c
BitKeeper/deleted/.del-auto_rebuild~79f363fad0302f23:
  Delete: bdb/examples_c/ex_apprec/auto_rebuild
BitKeeper/deleted/.del-ex_apprec.c~d76cd5b13fd7f9e:
  Delete: bdb/examples_c/ex_apprec/ex_apprec.c
BitKeeper/deleted/.del-ex_apprec.h~fbc4e37c9936bed8:
  Delete: bdb/examples_c/ex_apprec/ex_apprec.h
BitKeeper/deleted/.del-ex_apprec.src~3cb70069cd818a9c:
  Delete: bdb/examples_c/ex_apprec/ex_apprec.src
BitKeeper/deleted/.del-ex_apprec_rec.c~5cc676001646b782:
  Delete: bdb/examples_c/ex_apprec/ex_apprec_rec.c
BitKeeper/deleted/.del-ex_repquote.h~4d3695fe78cc55bf:
  Delete: bdb/examples_c/ex_repquote/ex_repquote.h
BitKeeper/deleted/.del-ex_rq_client.c~d7044f23b55b359:
  Delete: bdb/examples_c/ex_repquote/ex_rq_client.c
BitKeeper/deleted/.del-ex_rq_main.c~da00595d16b60cf0:
  Delete: bdb/examples_c/ex_repquote/ex_rq_main.c
BitKeeper/deleted/.del-ex_rq_master.c~85dbde9ad8245ecb:
  Delete: bdb/examples_c/ex_repquote/ex_rq_master.c
BitKeeper/deleted/.del-ex_rq_net.c~a54052285595ec00:
  Delete: bdb/examples_c/ex_repquote/ex_rq_net.c
BitKeeper/deleted/.del-ex_rq_util.c~fa9d3ac1141a075c:
  Delete: bdb/examples_c/ex_repquote/ex_rq_util.c
BitKeeper/deleted/.del-ex_thread.c~cff8e0283bd52c4c:
  Delete: bdb/examples_c/ex_thread.c
BitKeeper/deleted/.del-ex_tpcb.c~438b76c1166f4c05:
  Delete: bdb/examples_c/ex_tpcb.c
BitKeeper/deleted/.del-ex_tpcb.h~1f578e0fb4fb78d3:
  Delete: bdb/examples_c/ex_tpcb.h
BitKeeper/deleted/.del-AccessExample.cpp~1016122e96eac900:
  Delete: bdb/examples_cxx/AccessExample.cpp
BitKeeper/deleted/.del-BtRecExample.cpp~f79114b5ee4d7c99:
  Delete: bdb/examples_cxx/BtRecExample.cpp
BitKeeper/deleted/.del-EnvExample.cpp~ef23df0013fbadfb:
  Delete: bdb/examples_cxx/EnvExample.cpp
BitKeeper/deleted/.del-LockExample.cpp~7ef6698c1a6364c6:
  Delete: bdb/examples_cxx/LockExample.cpp
BitKeeper/deleted/.del-MpoolExample.cpp~45a8c0095f7149a3:
  Delete: bdb/examples_cxx/MpoolExample.cpp
BitKeeper/deleted/.del-TpcbExample.cpp~a3fab717eccade1a:
  Delete: bdb/examples_cxx/TpcbExample.cpp
BitKeeper/deleted/.del-Db.java.in~e887e6168818e1fe:
  Delete: bdb/java/src/com/sleepycat/db/Db.java.in
BitKeeper/deleted/.del-DbAppDispatch.java~b6c6964ddeceb451:
  Delete: bdb/java/src/com/sleepycat/db/DbAppDispatch.java
BitKeeper/deleted/.del-DbAppendRecno.java~20e7d8affe21bda4:
  Delete: bdb/java/src/com/sleepycat/db/DbAppendRecno.java
BitKeeper/deleted/.del-DbBtreeCompare.java~2def264d9d57c5d4:
  Delete: bdb/java/src/com/sleepycat/db/DbBtreeCompare.java
BitKeeper/deleted/.del-DbBtreePrefix.java~781bcc5275fd02a7:
  Delete: bdb/java/src/com/sleepycat/db/DbBtreePrefix.java
BitKeeper/deleted/.del-DbClient.java~526df4e74349d6d6:
  Delete: bdb/java/src/com/sleepycat/db/DbClient.java
BitKeeper/deleted/.del-DbDeadlockException.java~568c96bffced5abf:
  Delete: bdb/java/src/com/sleepycat/db/DbDeadlockException.java
BitKeeper/deleted/.del-DbDupCompare.java~905735b85e180ae2:
  Delete: bdb/java/src/com/sleepycat/db/DbDupCompare.java
BitKeeper/deleted/.del-DbEnv.java~79f045af656bde5c:
  Delete: bdb/java/src/com/sleepycat/db/DbEnv.java
BitKeeper/deleted/.del-DbEnvFeedback.java~5d68defe7f5b72ac:
  Delete: bdb/java/src/com/sleepycat/db/DbEnvFeedback.java
BitKeeper/deleted/.del-DbErrcall.java~ae4f822b75a145a9:
  Delete: bdb/java/src/com/sleepycat/db/DbErrcall.java
BitKeeper/deleted/.del-DbException.java~c1ea24cdb4bd795f:
  Delete: bdb/java/src/com/sleepycat/db/DbException.java
BitKeeper/deleted/.del-DbFeedback.java~7e7c1fc71f4ceee5:
  Delete: bdb/java/src/com/sleepycat/db/DbFeedback.java
BitKeeper/deleted/.del-DbHash.java~658cdd90ec5197b2:
  Delete: bdb/java/src/com/sleepycat/db/DbHash.java
BitKeeper/deleted/.del-DbKeyRange.java~28b6b373a22ec489:
  Delete: bdb/java/src/com/sleepycat/db/DbKeyRange.java
BitKeeper/deleted/.del-DbLock.java~23eaf3e4a1ccadc1:
  Delete: bdb/java/src/com/sleepycat/db/DbLock.java
BitKeeper/deleted/.del-DbLockNotGrantedException.java~4981a6c1878659ec:
  Delete: bdb/java/src/com/sleepycat/db/DbLockNotGrantedException.java
BitKeeper/deleted/.del-DbLockRequest.java~b6751a2bbac273de:
  Delete: bdb/java/src/com/sleepycat/db/DbLockRequest.java
BitKeeper/deleted/.del-DbLogc.java~cf88740f650599c3:
  Delete: bdb/java/src/com/sleepycat/db/DbLogc.java
BitKeeper/deleted/.del-DbLsn.java~813ddabdb6098c13:
  Delete: bdb/java/src/com/sleepycat/db/DbLsn.java
BitKeeper/deleted/.del-DbMemoryException.java~459fea825d4835a:
  Delete: bdb/java/src/com/sleepycat/db/DbMemoryException.java
BitKeeper/deleted/.del-DbMpoolStat.java~d868c0c27966efd8:
  Delete: bdb/java/src/com/sleepycat/db/DbMpoolStat.java
BitKeeper/deleted/.del-DbMultipleDataIterator.java~38348934676e4a64:
  Delete: bdb/java/src/com/sleepycat/db/DbMultipleDataIterator.java
BitKeeper/deleted/.del-DbMultipleIterator.java~587d1f79b3783ec0:
  Delete: bdb/java/src/com/sleepycat/db/DbMultipleIterator.java
BitKeeper/deleted/.del-DbMultipleKeyDataIterator.java~e8d9948c3bb3b408:
  Delete: bdb/java/src/com/sleepycat/db/DbMultipleKeyDataIterator.java
BitKeeper/deleted/.del-DbMultipleRecnoDataIterator.java~7243ef5ba89fbaa0:
  Delete: bdb/java/src/com/sleepycat/db/DbMultipleRecnoDataIterator.java
BitKeeper/deleted/.del-DbOutputStreamErrcall.java~7b2c1e221fcaf5a:
  Delete: bdb/java/src/com/sleepycat/db/DbOutputStreamErrcall.java
BitKeeper/deleted/.del-DbPreplist.java~520488d9ab8efca8:
  Delete: bdb/java/src/com/sleepycat/db/DbPreplist.java
BitKeeper/deleted/.del-DbRepTransport.java~ce17e09c2a29ef96:
  Delete: bdb/java/src/com/sleepycat/db/DbRepTransport.java
BitKeeper/deleted/.del-DbRunRecoveryException.java~6c02e5ffd95ec7d:
  Delete: bdb/java/src/com/sleepycat/db/DbRunRecoveryException.java
BitKeeper/deleted/.del-DbSecondaryKeyCreate.java~a154ad043120c3:
  Delete: bdb/java/src/com/sleepycat/db/DbSecondaryKeyCreate.java
BitKeeper/deleted/.del-DbTxn.java~da61406e8af5d725:
  Delete: bdb/java/src/com/sleepycat/db/DbTxn.java
BitKeeper/deleted/.del-DbUtil.java~7c40dfa8a06a1a50:
  Delete: bdb/java/src/com/sleepycat/db/DbUtil.java
BitKeeper/deleted/.del-Dbc.java~1cb27c86611ea9b0:
  Delete: bdb/java/src/com/sleepycat/db/Dbc.java
BitKeeper/deleted/.del-AccessExample.java~219ec1dab0b67a6c:
  Delete: bdb/java/src/com/sleepycat/examples/AccessExample.java
BitKeeper/deleted/.del-BtRecExample.java~642b5d36f9df6088:
  Delete: bdb/java/src/com/sleepycat/examples/BtRecExample.java
BitKeeper/deleted/.del-BulkAccessExample.java~293cb1f4c373e0cb:
  Delete: bdb/java/src/com/sleepycat/examples/BulkAccessExample.java
BitKeeper/deleted/.del-DbXAResource.java~874c6f2697b602db:
  Delete: bdb/java/src/com/sleepycat/db/xa/DbXAResource.java
BitKeeper/deleted/.del-DbXid.java~77ee0f96aa4eb4e:
  Delete: bdb/java/src/com/sleepycat/db/xa/DbXid.java
BitKeeper/deleted/.del-Dbt.java~ea175c8ddc0efd2c:
  Delete: bdb/java/src/com/sleepycat/db/Dbt.java
BitKeeper/deleted/.del-EnvExample.java~a44d38fba5efa4ef:
  Delete: bdb/java/src/com/sleepycat/examples/EnvExample.java
BitKeeper/deleted/.del-LockExample.java~adc9265cb3d68019:
  Delete: bdb/java/src/com/sleepycat/examples/LockExample.java
BitKeeper/deleted/.del-TpcbExample.java~5d4818c4e5e7320a:
  Delete: bdb/java/src/com/sleepycat/examples/TpcbExample.java
bdb/dist/s_include:
  removed 'crypto'
bdb/dist/s_recover:
  bdb/ cleanup
bdb/dist/s_symlink:
  bdb/ cleanup

client/mysql.cc:
  Auto merged
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mf_iocache.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/protocol.cc:
  SCCS merged

VC++Files/bdb/bdb.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_archive.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_buildall.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_checkpoint.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_deadlock.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_dll.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_dump.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_java.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_load.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_printlog.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_recover.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_stat.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_static.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_static1.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_tcl.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_test.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_upgrade.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_verify.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_access.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_btrec.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_env.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_lock.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_mpool.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_tpcb.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_access.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_btrec.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_env.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_lock.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_mpool.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
  Update to 4.1.0
VC++Files/client/mysql.dsp:
  Update to 4.1.0
VC++Files/client/mysqladmin.dsp:
  Update to 4.1.0
VC++Files/client/mysqlcheck.dsp:
  Update to 4.1.0
VC++Files/client/mysqlclient.dsp:
  Update to 4.1.0
VC++Files/client/mysqlclient.dsw:
  Update to 4.1.0
VC++Files/client/mysqldump.dsp:
  Update to 4.1.0
VC++Files/client/mysqlimport.dsp:
  Update to 4.1.0
VC++Files/client/mysqlshow.dsp:
  Update to 4.1.0
VC++Files/comp_err/comp_err.dsp:
  Update to 4.1.0
VC++Files/contrib/asm386/zlibvc.dsp:
  Update to 4.1.0
VC++Files/contrib/asm386/zlibvc.dsw:
  Update to 4.1.0
VC++Files/contrib/minizip/zlibvc.dsp:
  Update to 4.1.0
VC++Files/contrib/minizip/zlibvc.dsw:
  Update to 4.1.0
VC++Files/dbug/dbug.dsp:
  Update to 4.1.0
VC++Files/dbug/dbug.dsw:
  Update to 4.1.0
VC++Files/heap/heap.dsp:
  Update to 4.1.0
VC++Files/innobase/innobase.dsp:
  Update to 4.1.0
VC++Files/isam/isam.dsp:
  Update to 4.1.0
VC++Files/isam/isam.dsw:
  Update to 4.1.0
VC++Files/isamchk/isamchk.dsp:
  Update to 4.1.0
VC++Files/libmysql/libmysql.dsw:
  Update to 4.1.0
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Update to 4.1.0
VC++Files/libmysqld/libmysqld.dsp:
  Update to 4.1.0
VC++Files/libmysqltest/myTest.dsp:
  Update to 4.1.0
VC++Files/libmysqltest/mytest.dsw:
  Update to 4.1.0
VC++Files/merge/merge.dsp:
  Update to 4.1.0
VC++Files/merge/merge.dsw:
  Update to 4.1.0
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Update to 4.1.0
VC++Files/myisam/myisam.dsp:
  Update to 4.1.0
VC++Files/myisamchk/myisamchk.dsp:
  Update to 4.1.0
VC++Files/myisamlog/myisamlog.dsp:
  Update to 4.1.0
VC++Files/myisammrg/myisammrg.dsp:
  Update to 4.1.0
VC++Files/myisampack/myisampack.dsp:
  Update to 4.1.0
VC++Files/mysql.dsp:
  Update to 4.1.0
VC++Files/mysql.dsw:
  Update to 4.1.0
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Update to 4.1.0
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Update to 4.1.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Update to 4.1.0
VC++Files/mysqlmanager/MySqlManager.dsp:
  Update to 4.1.0
VC++Files/mysqlmanager/mysqlmanager.dsw:
  Update to 4.1.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Update to 4.1.0
VC++Files/mysqlshutdown/myshutdown.dsp:
  Update to 4.1.0
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Update to 4.1.0
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Update to 4.1.0
VC++Files/mysys/mysys.dsp:
  Update to 4.1.0
VC++Files/mysys/mysys.dsw:
  Update to 4.1.0
VC++Files/pack_isam/pack_isam.dsp:
  Update to 4.1.0
VC++Files/perror/perror.dsp:
  Update to 4.1.0
VC++Files/regex/regex.dsp:
  Update to 4.1.0
VC++Files/regex/regex.dsw:
  Update to 4.1.0
VC++Files/replace/replace.dsp:
  Update to 4.1.0
VC++Files/sql/mysqld.dsp:
  Update to 4.1.0
VC++Files/sql/mysqld.dsw:
  Update to 4.1.0
VC++Files/sql/mysqldmax.dsp:
  Update to 4.1.0
VC++Files/sql/old/mysqld.dsw:
  Update to 4.1.0
VC++Files/strings/MASM6x/strings.dsp:
  Update to 4.1.0
VC++Files/strings/MASM6x/strings.dsw:
  Update to 4.1.0
VC++Files/strings/backup/strings.dsp:
  Update to 4.1.0
VC++Files/strings/backup/strings.dsw:
  Update to 4.1.0
VC++Files/strings/noMASM/strings.dsp:
  Update to 4.1.0
VC++Files/strings/noMASM/strings.dsw:
  Update to 4.1.0
VC++Files/strings/strings.dsp:
  Update to 4.1.0
VC++Files/strings/strings.dsw:
  Update to 4.1.0
VC++Files/test1/test1.dsp:
  Update to 4.1.0
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Update to 4.1.0
VC++Files/thr_test/thr_test.dsp:
  Update to 4.1.0
VC++Files/vio/vio.dsp:
  Update to 4.1.0
VC++Files/zlib/zlib.dsp:
  Update to 4.1.0
bdb/build_win32/Berkeley_DB.dsw:
  Update to 4.1.0

mysql-test/t/fulltext2.test:
  fixed

Some changes to the prepared statement protocol to make it easier to use and faster.


Makefile.am:
  Fix to make dist to work with cmd-line-utils
client/mysql.cc:
  Portability fixes
client/mysqlbinlog.cc:
  Portabiliy fixes and remove usafe of FILE
configure.in:
  Fix to make dist to work with cmd-line-utils
heap/_check.c:
  Portability fixes
include/config-win.h:
  Portability fixes
include/m_ctype.h:
  Indentation cleanup
include/my_list.h:
  Portability fixes
include/mysql.h:
  Cleanup of BIND structure
include/violite.h:
  Portability fixes
innobase/dict/dict0dict.c:
  Portability fixes
innobase/dict/dict0load.c:
  Portability fixes
innobase/include/os0proc.h:
  Portability fixes (Heikki, please check)
innobase/os/os0proc.c:
  Portability fixes (Heikki, please check)
innobase/ut/ut0ut.c:
  Portability fixes
isam/pack_isam.c:
  Portability fixes
libmysql/libmysql.c:
  Portability fixes
  Remove obscure usage of the length parameter for prepared statements.
libmysql/libmysql.def:
  Remove not existing functions
libmysqld/lib_sql.cc:
  Remove compiler warning
mysql-test/r/explain.result:
  Fix after merge
mysql-test/r/join.result:
  Fix after merge
mysys/my_once.c:
  Portability fix
mysys/tree.c:
  Portability fixes
sql/field.cc:
  Portability fixes
sql/filesort.cc:
  move assert.h to mysql_priv.h
sql/ha_berkeley.cc:
  move assert.h to mysql_priv.h
sql/ha_innodb.cc:
  move assert.h to mysql_priv.h
sql/item.cc:
  move assert.h to mysql_priv.h
  Fixed syntax error
sql/item_cmpfunc.cc:
  move assert.h to mysql_priv.h
sql/item_func.cc:
  move assert.h to mysql_priv.h
sql/item_row.cc:
  move assert.h to mysql_priv.h
sql/item_strfunc.cc:
  Portability fix
sql/item_subselect.cc:
  Portability fix
sql/item_sum.cc:
  move assert.h to mysql_priv.h
sql/lex.h:
  Portability fix
sql/lock.cc:
  move assert.h to mysql_priv.h
sql/log.cc:
  move assert.h to mysql_priv.h
sql/log_event.cc:
  Portability fix
sql/mf_iocache.cc:
  move assert.h to mysql_priv.h
sql/mysql_priv.h:
  move assert.h to mysql_priv.h
sql/mysqld.cc:
  move assert.h to mysql_priv.h
sql/opt_range.cc:
  move assert.h to mysql_priv.h
sql/password.c:
  Portability fix
sql/protocol.cc:
  move assert.h to mysql_priv.h
sql/set_var.cc:
  Portability fix
sql/slave.cc:
  move assert.h to mysql_priv.h
sql/spatial.cc:
  Portability fix
sql/sql_acl.cc:
  move assert.h to mysql_priv.h
sql/sql_base.cc:
  move assert.h to mysql_priv.h
sql/sql_cache.cc:
  move assert.h to mysql_priv.h
sql/sql_class.cc:
  move assert.h to mysql_priv.h
sql/sql_handler.cc:
  move assert.h to mysql_priv.h
sql/sql_help.cc:
  Removed compiler warning
sql/sql_lex.cc:
  Portability fix
sql/sql_lex.h:
  Portability fix
sql/sql_parse.cc:
  move assert.h to mysql_priv.h
sql/sql_prepare.cc:
  move assert.h to mysql_priv.h
sql/sql_repl.cc:
  move assert.h to mysql_priv.h
sql/sql_select.cc:
  move assert.h to mysql_priv.h
sql/sql_string.cc:
  Portability fix
sql/sql_string.h:
  Portability fix
sql/sql_table.cc:
  move assert.h to mysql_priv.h
sql/sql_yacc.yy:
  Portability fix
  Remove not accessed code
strings/ctype-bin.c:
  Portability fix
strings/ctype-mb.c:
  Portability fix
strings/ctype.c:
  Portability fix
tests/client_test.c:
  A

include/myisam.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged

myisam/ftdefs.h:
  intermediate cleanup checkin
myisam/mi_create.c:
  intermediate cleanup checkin
myisam/myisamchk.c:
  intermediate cleanup checkin
myisam/ft_parser.c:
  intermediate cleanup checkin
myisam/ft_update.c:
  intermediate cleanup checkin
myisam/mi_update.c:
  intermediate cleanup checkin
mysql-test/r/fulltext.result:
  stopword test
mysql-test/t/fulltext.test:
  stopword test
mysys/mulalloc.c:
  function comments clarified
include/my_handler.h:
  get_key_length_rdonly utility macro
include/myisam.h:
  this kind of hacks bites :)
myisam/ft_dump.c:
  bugfix
myisam/mi_open.c:
  bugfix
myisam/sort.c:
  bugfixing
myisam/mi_rnext.c:
  not a solution at all, but a temporary fix to make
  mi_rnext to work on ft2 index. (only ft_dump uses mi_rnext
  on fulltext indexes for now).
myisam/ft_boolean_search.c:
  ft_sintXkorr, ft_intXstore
myisam/ft_nlq_search.c:
  ft_sintXkorr, ft_intXstore
myisam/fulltext.h:
  ft_sintXkorr, ft_intXstore
myisam/mi_check.c:
  ft_sintXkorr, ft_intXstore
myisam/ft_static.c:
  two-level tree support in wi_write()
myisam/mi_write.c:
  two-level tree support in wi_write()
myisam/myisamdef.h:
  two-level tree support in wi_write()
myisam/mi_delete.c:
  support for ft2 in mi_delete
mysql-test/r/fulltext2.result:
  support for ft2 in mi_delete
mysql-test/t/fulltext2.test:
  support for ft2 in mi_delete

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


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

sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_derived.cc:
  resolve fix.

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


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of cardinality error
mysql-test/t/subselect.test:
  test of cardinality error

sql/mysqld.cc:
  removing debugging stuff
sql/sql_derived.cc:
  fix removed

into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1


sql/ha_innodb.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

sql/sql_derived.cc:
  I think it's better not to implement another "*any*"

into myvenu.com:/home/venu/bk/src-4.1


sql/sql_parse.cc:
  Auto merged

  Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1


sql/ha_innodb.cc:
  Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1

mysql-test/r/explain.result:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged

mysql-test/r/explain.result:
  test of bug with EXPLAIN on empty table
mysql-test/t/explain.test:
  test of bug with EXPLAIN on empty table

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
libmysqld/libmysqld.c:
  conflicts resolving

embedded-related changes


include/mysql_com.h:
  net_flush emptification
libmysqld/lib_sql.cc:
  Some Protocol:: methods implemented
sql/convert.cc:
  changes to use convert in embedded library
sql/field.cc:
  set_key_image changed
sql/item.cc:
  obsolete functions removed
sql/item.h:
  embedded-related changes in Protocol class
sql/log.cc:
  there's no ports in embedded library
sql/mysqld.cc:
  some debug stuff
sql/protocol.cc:
  embedded-related changes
sql/protocol.h:
  embedded-related changes
sql/sql_cache.cc:
  comment added
sql/sql_class.cc:
  no need to do special embedded select_send::send_row
sql/sql_class.h:
  embedded-related changes
sql/sql_parse.cc:
  comments added debugging stuff deleted
sql/sql_show.cc:
  non-protocol sending removed

mysql-test/r/join.result:
  Test of LEFT JOIN bug
mysql-test/t/join.test:
  Test of LEFT JOIN bug

sql/sql_parse.cc:
  Auto merged
tests/client_test.c:
  Auto merged

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/log_event.cc:
  merge with 4.0
sql/sql_db.cc:
  merge with 4.0 (use local)

cmd-line-utils/libedit/chared.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/common.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/el.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/emacs.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/fgetln.c:
  Removed RCSID to get rid of compiler warnings
  Removed compiler warning
cmd-line-utils/libedit/hist.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/history.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/key.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/map.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/parse.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/prompt.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/read.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/readline.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/refresh.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/search.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/sig.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/term.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/tokenizer.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/tty.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/vi.c:
  Removed RCSID to get rid of compiler warnings
mysys/Makefile.am:
  Remove library dependency for charset2html to get correct makefile
tests/client_test.c:
  Indentation change

This fixes a problem with SHOW PROCESSLIST


sql/log_event.cc:
  Fixes cases where thd->query was not protected
sql/sql_acl.cc:
  Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_db.cc:
  Fixes cases where thd->query was not protected

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
innobase/btr/btr0sea.c:
  Merge with 3.23 (use local file)
sql/slave.cc:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23
sql/sql_parse.cc:
  Merge with 3.23

This fixes a possible core dump problem in SHOW PROCESSLIST


sql/slave.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
  Also first set query_length, then query
sql/sql_parse.cc:
  Indentation changes

into myvenu.com:/home/venu/work/sql/dev-4.1

into myvenu.com:/home/venu/bk/src-4.1


libmysql/libmysql.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

client/insert_test.c:
  Fixed core dump in test

BitKeeper/etc/ignore:
  added cmd-line-utils/libedit/common.h
mysys/queues.c:
  Added comments
sql/sql_parse.cc:
  Simple code cleanup
tests/grant.res:
  Updated results for 4.1

sql/sql_table.cc:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.control

into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.clone