into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


ndb/src/Makefile.am:
  Auto merged
configure.in:
  Difficult merge - will do by hand.

ndb/src/libndb.ver.in:
  BitKeeper file /home/mtaylor/src/mysql-4.1-maint/ndb/src/libndb.ver.in

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


configure.in:
  Auto merged
ndb/src/Makefile.am:
  Auto merged

configure.in:
  Added variables to support ndbclient library versioning.
  Set version to 1.0.0 for 4.1
ndb/src/Makefile.am:
  Making use of new variables. Adding support for versioned libraries.

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


mysql-test/r/ndb_types.result:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged

mysql-test/r/ndb_types.result:
  update results
mysql-test/t/ndb_types.test:
  Sleep a bit longer, to ensure that timestamp changes between:
  set @now = now();
  and:
  insert into/update t1
  
  Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again.  This should(?) avoid that fluke.
  
  Clean up test file a bit while I'm here.

Makefile.am:
  Fix previous bad merge.  Re-enable the test-ps target.

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


client/mysqlbinlog.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41


sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge

into  recycle.(none):/src/mysql-5.0-maint


client/mysql_upgrade.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/string.c:
  Auto merged

- Create space safe strings for system() calls in mysql_upgrade.exe


client/mysql_upgrade.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Make use of new dynstr_append_os_quoted function to produce a string safe for
  passing to the system() function.                                              
  - Refactor possible source of assertion.
include/my_sys.h:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Declare dynstr_append_os_quoted function.
mysys/string.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Define dynstr_append_os_quoted function.  This function will concatenate any 
  number of strings, escapes any OS quote in the result then surround the whole  
  affair in another set of quotes which is finally appended to specified         
  DYNAMIC_STRING.

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50


configure.in:
  Auto merged

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


configure.in:
  Use local

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


BUILD/check-cpu:
  Auto merged

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50


configure.in:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/sync0arr.h:
  Auto merged
innobase/include/sync0rw.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/os/os0sync.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


configure.in:
  Use local

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


innobase/buf/buf0buf.c:
  Use local
innobase/buf/buf0flu.c:
  Use local
innobase/buf/buf0lru.c:
  Use local
innobase/include/buf0buf.h:
  Use local
innobase/include/buf0buf.ic:
  Use local
innobase/include/sync0arr.h:
  Use local
innobase/include/sync0rw.h:
  Use local
innobase/include/sync0rw.ic:
  Use local
innobase/include/sync0sync.h:
  Use local
innobase/os/os0sync.c:
  Use local
innobase/sync/sync0arr.c:
  Use local
innobase/sync/sync0rw.c:
  Use local
innobase/sync/sync0sync.c:
  Use local

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


BUILD/check-cpu:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


BUILD/check-cpu:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BUILD/check-cpu:
  Auto merged
BitKeeper/etc/collapsed:
  'Auto converge'

	hyphen in it (like ds-cpl).

convert illegal chars in cpu flags to '_' for variable assignment


BUILD/check-cpu:
  convert illegal chars in cpu flags to '_' for variable assignment

sql/mysqld.cc:
  Once again, disable symlink.test under valgrind builds. symlink.test
  fails deep in mi_repair - the result of this having been disabled
  for almost 5 years.

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max


sql/sql_parse.cc:
  SCCS merged

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


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

by the patch for Bug#4968


sql/sql_parse.cc:
  Fix lowercase_tables2 test failure on powermacg5: table_case_name()
  function needed create_info.alias if lowercase_table_names=2, which
  was not set for the stack copy of HA_CREATE_INFO. Move the
  update of create_info.alias from create_table_precheck to 
  mysql_execute_command, so that it is done on the right object.

windows with a small perl script that does exactly the same. 

mysql-test/r/ps.result:
  Update result files.
mysql-test/t/ps.test:
  Disable result ouptut of SHOW CREATE TABLE: DATA DIRECTORY option
  may be present or absent from the output depending on the build
  otpions and the operating system, so the output is not consistent
  across supported platforms.
sql/mysqld.cc:
  Remove a tricky #ifdef dependency of --use-symbolic-links on PURIFY
  added in 2002: DEBUG options should not influence server functionality.
  This backfired by producing different output of SHOW CREATE TABLE
  depending on the build options (see also Bug#25677 "With 
  --skip-symbolic-links option on, DATA DIRECTORY clause
  is silently ignored".