into  siva.hindu.god:/usr/home/tim/m/bk/b20536-51


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged

sql/item_strfunc.h:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Add --echo End of 5.0 tests
mysql-test/t/ctype_ucs.test:
  Add --echo End of 5.0 tests
sql/item_strfunc.cc:
  Manual merge

into  zim.(none):/home/brian/mysql/remove-bdb-5.1

libmysqld/CMakeLists.txt:
  Fix for build for BDB
mysys/base64.c:
  Removed warning
mysys/my_pread.c:
  Removed warning
sql-common/my_time.c:
  Removed Warning
sql/CMakeLists.txt:
  Editing for BDB
storage/csv/ha_tina.cc:
  Removed warning
storage/myisam/ft_parser.c:
  Removed warning
storage/myisam/mi_delete_all.c:
  Removed unused variable
storage/myisam/mi_packrec.c:
  Removed unused variable
win/README:
  Fixed docs on Windows BDB
win/configure.js:
  Removed function call to add support for building BDB

into  romeo.(none):/home/bk/mytap-mysql-5.1-new-maint

These are using old version of the Test::Harness modules, so I resort
to a safer way of running executable files.


unittest/README.txt:
  Adding reference to Doxygen-generated documentation on the intranet.
unittest/unit.pl:
  Using environment HARNESS_PERL_SWITCHES instead of a replacement
  straps

CMakeLists.txt:
  Fix for Windows build
mysql-test/r/binlog_row_binlog.result:
  Updated row result
mysql-test/r/multi_update.result:
  Updated row result
mysql-test/t/multi_update.test:
  Updated row result

Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references. 


mysql-test/r/backup.result:
  fix warnings
mysql-test/r/im_options.result:
  Remove missed bdb skip
mysql-test/r/im_utils.result:
  Remove missed bdb-skip
mysql-test/r/log_tables.result:
  Fix warnings
mysql-test/r/show_check.result:
  Fix warnings
mysql-test/r/sp_trans.result:
  Fix warning
mysql-test/r/type_timestamp.result:
  Fix warning
mysql-test/r/warnings.result:
  Fix warning
mysql-test/t/disabled.def:
  Disabled Federation test
mysql-test/t/federated_transactions.test:
  Fixed comments in federation test
netware/mysql_install_db.c:
  Fix install breakage.
netware/mysql_test_run.c:
  Fix install breakage.
scripts/mysql_install_db.sh:
  Fix install breakage
storage/myisam/ftbench/ft-test-run.sh:
  Fixed test which is never run
support-files/my-innodb-heavy-4G.cnf.sh:
  Modified examples
support-files/my-small.cnf.sh:
  Modified examples

Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
    
Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings.


mysql-test/r/ctype_ucs.result:
  Add tests for bug #20536.
mysql-test/t/ctype_ucs.test:
  Add tests for bug #20536.
  
  Tests showing correct behavior for MD5(), SHA1(), MAKE_SET() and EXPORT_SET().
  
  Also, tests showing incorrect behavior, which will remain "Won't fix", for
  PASSWORD(), OLD_PASSWORD(), ENCRYPT() and QUOTE().
sql/item_strfunc.cc:
  Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
  
  Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings.
sql/item_strfunc.h:
  Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.

into  zim.(none):/home/brian/mysql/remove-bdb-5.1

into  rama.(none):/home/jimw/my/mysql-5.1-clean


sql/field.h:
  Resolve conflict
sql/ha_federated.cc:
  Resolve conflict

sql/share/errmsg.txt:
  Merged by hand German translations as sent by Stefan.
  
  Normalized indentation by expanding tabs to spaces.

BitKeeper/deleted/.del-bdb-alter-table-1.result:
  Rename: mysql-test/r/bdb-alter-table-1.result -> BitKeeper/deleted/.del-bdb-alter-table-1.result
BitKeeper/deleted/.del-bdb-alter-table-1.test:
  Rename: mysql-test/t/bdb-alter-table-1.test -> BitKeeper/deleted/.del-bdb-alter-table-1.test
BitKeeper/deleted/.del-bdb-alter-table-2-master.opt:
  Rename: mysql-test/t/bdb-alter-table-2-master.opt -> BitKeeper/deleted/.del-bdb-alter-table-2-master.opt
BitKeeper/deleted/.del-bdb-alter-table-2.result:
  Rename: mysql-test/r/bdb-alter-table-2.result -> BitKeeper/deleted/.del-bdb-alter-table-2.result
BitKeeper/deleted/.del-bdb-alter-table-2.test:
  Rename: mysql-test/t/bdb-alter-table-2.test -> BitKeeper/deleted/.del-bdb-alter-table-2.test
BitKeeper/deleted/.del-bdb-crash.result:
  Rename: mysql-test/r/bdb-crash.result -> BitKeeper/deleted/.del-bdb-crash.result
BitKeeper/deleted/.del-bdb-crash.test:
  Rename: mysql-test/t/bdb-crash.test -> BitKeeper/deleted/.del-bdb-crash.test
BitKeeper/deleted/.del-bdb-deadlock.result:
  Rename: mysql-test/r/bdb-deadlock.result -> BitKeeper/deleted/.del-bdb-deadlock.result
BitKeeper/deleted/.del-bdb-deadlock.test:
  Rename: mysql-test/t/bdb-deadlock.test -> BitKeeper/deleted/.del-bdb-deadlock.test
BitKeeper/deleted/.del-bdb-deadlock.tminus:
  Rename: mysql-test/t/bdb-deadlock.tminus -> BitKeeper/deleted/.del-bdb-deadlock.tminus
BitKeeper/deleted/.del-bdb.result:
  Rename: mysql-test/r/bdb.result -> BitKeeper/deleted/.del-bdb.result
BitKeeper/deleted/.del-bdb.test:
  Rename: mysql-test/t/bdb.test -> BitKeeper/deleted/.del-bdb.test
BitKeeper/deleted/.del-bdb_cache-master.opt~e54093fff2e73631:
  Rename: mysql-test/t/bdb_cache-master.opt -> BitKeeper/deleted/.del-bdb_cache-master.opt~e54093fff2e73631
BitKeeper/deleted/.del-bdb_cache.result~5767ff4f4b228a66:
  Rename: mysql-test/r/bdb_cache.result -> BitKeeper/deleted/.del-bdb_cache.result~5767ff4f4b228a66
BitKeeper/deleted/.del-bdb_cache.test~818df448403a5598:
  Rename: mysql-test/t/bdb_cache.test -> BitKeeper/deleted/.del-bdb_cache.test~818df448403a5598
BitKeeper/deleted/.del-bdb_gis.result:
  Rename: mysql-test/r/bdb_gis.result -> BitKeeper/deleted/.del-bdb_gis.result
BitKeeper/deleted/.del-bdb_gis.test:
  Rename: mysql-test/t/bdb_gis.test -> BitKeeper/deleted/.del-bdb_gis.test
BitKeeper/deleted/.del-have_bdb.inc:
  Rename: mysql-test/include/have_bdb.inc -> BitKeeper/deleted/.del-have_bdb.inc
BitKeeper/deleted/.del-have_bdb.require:
  Rename: mysql-test/r/have_bdb.require -> BitKeeper/deleted/.del-have_bdb.require
BitKeeper/deleted/.del-index_merge_bdb.result:
  Rename: mysql-test/r/index_merge_bdb.result -> BitKeeper/deleted/.del-index_merge_bdb.result
BitKeeper/deleted/.del-index_merge_bdb.test:
  Rename: mysql-test/t/index_merge_bdb.test -> BitKeeper/deleted/.del-index_merge_bdb.test
BitKeeper/deleted/.del-ps_6bdb.result:
  Rename: mysql-test/r/ps_6bdb.result -> BitKeeper/deleted/.del-ps_6bdb.result
BitKeeper/deleted/.del-ps_6bdb.test:
  Rename: mysql-test/t/ps_6bdb.test -> BitKeeper/deleted/.del-ps_6bdb.test
BitKeeper/deleted/.del-rowid_order_bdb.result:
  Rename: mysql-test/r/rowid_order_bdb.result -> BitKeeper/deleted/.del-rowid_order_bdb.result
BitKeeper/deleted/.del-rowid_order_bdb.test:
  Rename: mysql-test/t/rowid_order_bdb.test -> BitKeeper/deleted/.del-rowid_order_bdb.test
BitKeeper/deleted/.del-sql_manager.h:
  Rename: sql/sql_manager.h -> BitKeeper/deleted/.del-sql_manager.h
libmysqld/Makefile.am:
  Removed bdb from the engine
mysql-test/extra/binlog_tests/binlog.test:
  Removed bdb support
mysql-test/r/binlog_stm_binlog.result:
  Updated results
mysql-test/r/ctype_utf8.result:
  Removed bdb support
mysql-test/t/ctype_utf8.test:
  Removed bdb support
sql/CMakeLists.txt:
  Removed file for Windows build
sql/Makefile.am:
  Removed unneeded include file.
sql/sql_manager.cc:
  Removed include file.

into  zim.(none):/home/brian/mysql/remove-bdb-5.1


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge


sql/ha_innodb.cc:
  Null-merge.
storage/innobase/fil/fil0fil.c:
  Null-merge.
storage/innobase/ibuf/ibuf0ibuf.c:
  Null-merge.

This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 


BitKeeper/deleted/.del-ha_berkeley.cc:
  Delete: sql/ha_berkeley.cc
BitKeeper/deleted/.del-ha_berkeley.h:
  Delete: sql/ha_berkeley.h
mysql-test/install_test_db.sh:
  Removed skip option
mysql-test/mysql-test-run.pl:
  Remove bdb option
mysql-test/mysql-test-run.sh:
  Remove bdb option
sql/Makefile.am:
  Remove bdb option
sql/handler.cc:
  Remove references to bdb
sql/lex.h:
  Removed lex for bdb
sql/mysql_priv.h:
  Removed bdb privs
sql/mysqld.cc:
  Removed all options for bdb
sql/set_var.cc:
  Removed variables for bdb
sql/sql_yacc.yy:
  Removed yacc for bdb

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge


sql/sql_base.cc:
  Auto merged

BitKeeper/deleted/.del-CMakeLists.txt:
  Delete: storage/bdb/CMakeLists.txt
BitKeeper/deleted/.del-LICENSE:
  Delete: storage/bdb/LICENSE
BitKeeper/deleted/.del-Makefile.in:
  Delete: storage/bdb/Makefile.in
BitKeeper/deleted/.del-compile-pentium-debug-no-bdb:
  Delete: BUILD/compile-pentium-debug-no-bdb
BUILD/Makefile.am:
  Remove dropped file
configure.in:
  Remove berkely from configure.
BUILD/compile-dist:
  Remove option to build bdb
BUILD/compile-solaris-sparc-purify:
  Remove option for bdb build
libmysqld/Makefile.am:
  Remove option for bdb build
sql/Makefile.am:
  Remove bdb build

  After merge fix


sql/table.cc:
  After merge fix
sql/sql_base.cc:
  After merge fix

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge


sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

sql/sql_parse.cc:
  Post-merge fix.  No need to check DB name twice.

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.  Place 5.0 test before 5.1 test.
mysql-test/t/sp.test:
  Manual merge.  Place 5.0 test before 5.1 test.
mysys/my_bitmap.c:
  Manual merge.
scripts/make_binary_distribution.sh:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_class.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

into  sunlight.local:/local_work/leak_fix-5.1-mysql


sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
sql/unireg.h:
  Auto merged
sql/sql_base.cc:
  Manual merge
sql/table.cc:
  Manual merge

(this is not a fix to the bug, but simply to disable the test in 
order to push a 5.0 to 5.1 merge)

This merge contains:

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge


mysql-test/t/disabled.def:
  BUG #21524 "'ps' test fails in --ps-protocol test AMD64 bit"
  
  (this is not a fix to the bug, but simply to disable the test in 
  order to push a 5.0 to 5.1 merge)

  Correct memory leak fix


sql/unireg.h:
  Correct memory leak fix
sql/table.cc:
  Correct memory leak fix
sql/sql_view.h:
  Correct memory leak fix
sql/sql_view.cc:
  Correct memory leak fix
sql/sql_lex.h:
  Correct memory leak fix
sql/sql_base.cc:
  Correct memory leak fix

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge


BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-libmysqld_ia64.dsp~578ab58d5f281d2a:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
  Auto merged
BitKeeper/deleted/.del-mysqldemb_ia64.dsp~c7f7d75d542393cd:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax_ia64.dsp~25006b7cc0725ad1:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
include/my_base.h:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
mysql-test/r/federated.result:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
mysql-test/t/federated.test:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/field.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/ha_federated.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
sql/handler.cc:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
tests/mysql_client_test.c:
  Hand merge of conflicts (5.0-5.1 merge), second try 
  
  Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
  
  bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge

we didn't check for NULL value of the
lex_create_info->db_type pointer.
The pointer is NULL in the case, when the engine name is
unknown to the server. This happens with NDB on Windows.


sql/sql_table.cc:
  don't check pointer in the case, it is NULL

into  mysql.com:/home/cps/mysql/devel/5.1-curs-bug


sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/log_tables.result:
  SCCS merged
mysql-test/t/log_tables.test:
  SCCS merged

into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  rama.(none):/home/jimw/my/mysql-5.1-clean

Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row.

into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c

                gets deadlocked when dropping w/ log on"

Log tables rely on concurrent insert machinery to add data.
This means that log tables are always opened and locked by
special (artificial) logger threads. Because of this, the thread
which tries to drop a log table starts to wait for the table
to be unlocked. Which will happen only if the log table is disabled.
Alike situation happens if one tries to alter a log table.
However in addition to the problem above, alter table calls
check_if_locking_is_allowed() routine for the engine. The
routine does not allow alter for the log tables. So, alter
doesn't start waiting forever for logs to be disabled, but 
returns with an error.
Another problem is that not all engines could be used for
the log tables. That's because they need concurrent insert.

In this patch we:
(1) Explicitly disallow to drop/alter a log table if it
    is currently used by the logger.
(2) Update MyISAM to support log tables
(3) Allow to drop log tables/alter log tables if log is
    disabled
At the same time we (4) Disallow to alter log tables to
unsupported engine (after this patch CSV and MyISAM are 
alowed)
Recommit with review fixes.


mysql-test/r/log_tables.result:
  Update result file.
  Note: there are warnings in result file. This is because of CSV
  bug (Bug #21328). They should go away after it is fixed.
mysql-test/t/log_tables.test:
  Add a test for the bug
sql/ha_myisam.cc:
  Add log table handling to myisam: as log tables
  use concurrent insert, they are typically
  locked with TL_CONCURRERENT_INSERT lock. So,
  disallow other threads to attempt locking of
  the log tables in incompatible modes. Because
  otherwise the threads will wait for the tables
  to be unlocked forever.
sql/handler.cc:
  Add a function to check if a table we're going to lock
  is a log table and if the lock mode we want allowed
sql/handler.h:
  Add a new function to check compatibility of the locking
sql/log.cc:
  we shouldn't close the log table if and only
  if this particular table is already closed
sql/log.h:
  add new functions to check if a log is enabled
sql/share/errmsg.txt:
  add new error messages
sql/sql_table.cc:
  DROP and ALTER TABLE should not work on log
  tables if the log tables are enabled
storage/csv/ha_tina.cc:
  move function to check if the locking for the log
  tables allowed to handler class, so that we can
  reuse it in other engines.
storage/myisam/mi_extra.c:
  add new ::extra() flag processing to myisam
storage/myisam/mi_open.c:
  init log table flag
storage/myisam/mi_write.c:
  update status after each write if it's a log table
storage/myisam/myisamdef.h:
  Add new log table flag to myisam share.
  We need it to distinguish between usual
  and log tables, as for the log tables we
  should provide concurrent insert in a
  different way than for usual tables: we
  want new rows to be immediately visible
  to other threads.

sql/ha_federated.cc:
  After merge fix

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/ha_federated.cc:
  Manual merge

Due to incorrect handling of FLUSH TABLES, log tables were marked for flush,
but not reopened. Later we started to wait for the log table to be closed
(disabled) after the flush. And as nobody disabled logs in concurrent treads,
the command lasted forever.
After internal consultations it was decided to skip logs during FLUSH TABLES.
The reasoning is that logging is done in the "log device", whatever it is
which is always active and controlled by FLUSH LOGS. So, to flush logs
one should use FLUSH LOGS, and not FLUSH TABLES.


mysql-test/r/log_tables.result:
  update result file
mysql-test/t/log_tables.test:
  add a test for the bug
sql/sql_base.cc:
  Skip log tables during FLUSH TABLES