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


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_class.h:
  Auto merged
configure.in:
  Use local

into  siva.hindu.god:/usr/home/tim/m/bk/50


scripts/mysqld_multi.sh:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/50


mysql-test/mysql-test-run.pl:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/41

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

into  polly.local:/home/kaa/src/maint/mysql-4.1-maint

into  polly.local:/tmp/maint/bug24037/my51-bug24037


strings/ctype-extra.c:
  Auto merged

into  polly.local:/tmp/maint/bug24037/my50-bug24037


strings/conf_to_src.c:
  Auto merged
strings/ctype-extra.c:
  Auto merged

mysql-test/include/ndb_not_readonly.inc:
  New BitKeeper file ``mysql-test/include/ndb_not_readonly.inc''

Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:

LEFT-TO-RIGHT MARK (LRM)
RIGHT-TO-LEFT MARK (RLM)


sql/share/charsets/hebrew.xml:
  Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:
  
  LEFT-TO-RIGHT MARK (LRM)
  RIGHT-TO-LEFT MARK (RLM)
strings/conf_to_src.c:
  Added a warning comment in the generated C source file.
strings/ctype-extra.c:
  Re-generated from sql/share/charsets/hebrew.xml
mysql-test/r/ctype_hebrew.result:
  Added the test case for bug #24037 "Lossy Hebrew to Unicode conversion"
mysql-test/t/ctype_hebrew.test:
  Added the test case for bug #24037 "Lossy Hebrew to Unicode conversion"

before referencing it.


sql/sql_plugin.cc:
  Make sure the plugin being refernced in the plugins array has not been set to NULL already.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint

   Fix uninitialized memory.


sql/sql_plugin.cc:
  move my_alloca() call out of nested stack frame.
  ensure that every element of array is initialized.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/rpl_openssl.test:
  Auto merged

mysql-test/t/rpl_openssl.test:
  Exclude

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

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


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_class.h:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/50


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_class.h:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/41


scripts/mysqld_multi.sh:
  Auto merged

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


include/mysql_h.ic:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
vio/viossl.c:
  Auto merged

 - Skip tests using chmod when running as root


mysql-test/t/information_schema_chmod.test:
  Use mysqltest builtin "chmode"
mysql-test/t/mysqltest.test:
  Dont run as root - test chmod
mysql-test/t/rpl_rotate_logs.test:
  Use mysqltest builtin "chmode"
  Use 'write_file' and 'chmod' instead of system
mysql-test/t/trigger.test:
  Don't run as root
  Use 'write_file' and 'chmod'
mysql-test/t/varbinary.test:
  Don't run as root

 - Don't call SSL_shutdown a second time


vio/viossl.c:
  SSL_shutdown might return 0 indicating that it should be called once
  again for a graceful shutdown. Since the socket are going to be closed
  anyway ther is no need for the second call.

configure.in:
  Fix an omission: Version number for NDB is still kept separate (up to 5.0)
  and must be changed in sync with the general version number in AM_INIT_AUTOMAKE.

into  trift2.:/MySQL/M51/tmp-5.1


client/mysql_upgrade.c:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Null merge: Socket name change of 5.0 does not apply here.
mysql-test/t/rpl_000015.test:
  SCCS merged

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Null-merge: The new 5.0 version does not affect 5.1 at all

sql/mysqld.cc:
  Post-merge fix
sql/set_var.cc:
  Post-merge fix

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

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


cmd-line-utils/readline/histfile.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/udf_example.c:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
strings/decimal.c:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/func_str.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge
mysql-test/t/func_str.test:
  Manual merge
sql/mysqld.cc:
  Manual merge
storage/innobase/handler/ha_innodb.cc:
  Manual merge
storage/innobase/handler/ha_innodb.h:
  Manual merge
storage/innobase/row/row0mysql.c:
  Manual merge

many as neeeded

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


storage/innobase/dict/dict0dict.c:
  Null merge
storage/innobase/handler/ha_innodb.cc:
  Null merge
storage/innobase/include/sync0rw.h:
  Null merge
storage/innobase/include/sync0sync.h:
  Null merge
storage/innobase/include/sync0sync.ic:
  Null merge
storage/innobase/log/log0recv.c:
  Null merge
storage/innobase/srv/srv0start.c:
  Null merge
storage/innobase/sync/sync0rw.c:
  Null merge
storage/innobase/sync/sync0sync.c:
  Null merge
storage/innobase/trx/trx0roll.c:
  Null merge
storage/innobase/trx/trx0trx.c:
  Null merge

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-build