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

into  mysql.com:/home/kent/bk/build/mysql-5.1-build


support-files/mysql.spec.sh:
  Auto merged

into  mysql.com:/home/kent/bk/build/mysql-5.0-build

into  mysql.com:/home/kent/bk/build/mysql-4.1-build


support-files/mysql.spec.sh:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


scripts/make_binary_distribution.sh:
  Use local (manual merge)

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

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


configure.in:
  Auto merged

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


support-files/mysql.spec.sh:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Use local - version number changes don't propagate.

into  trift2.:/MySQL/M50/man8-5.0


support-files/mysql.spec.sh:
  Manual merge: Add the man pages for "ndbd" and "ndb_mgmd".

into  trift2.:/MySQL/M41/push-4.1

support-files/mysql.spec.sh:
  Add the man pages for "ndbd" and "ndb_mgmd".

into  trift2.:/MySQL/M41/push-4.1


configure.in:
  Auto merged

into  mysql.com:/data0/mysqldev/my/build-200802282059-4.1.24/mysql-4.1-release

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


sql/slave.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/include/commit.inc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/commit_1innodb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/suite/binlog/r/binlog_unsafe.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Auto merged

mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Removing SHOW MASTER STATUS that does not seem to make sense.
mysql-test/extra/rpl_tests/rpl_log.test:
  Correcting test case to sync slave with master.
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Result change.
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Removing unsafe variable from list of safe variables.
mysql-test/suite/rpl/r/rpl_loaddata.result:
  Result change.
mysql-test/suite/rpl/r/rpl_skip_error.result:
  Result change.
mysql-test/suite/rpl/t/rpl_skip_error.test:
  Correcting bad manual+automatic merge. Test is now only relevant for statement-
  based replication.
sql/rpl_rli.cc:
  Correcting automerge undoing previous change of return value.
  Relay_log_info::wait_for_pos() should return -2 when not initialized to work
  correctly.

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


client/mysqldump.c:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/push-5.0


scripts/make_win_bin_dist:
  Auto merged

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


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/unireg.h:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0


client/mysqldump.c:
  Auto merged

into  trift2.:/MySQL/M41/push-4.1

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


client/mysqldump.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192


client/mysqldump.c:
  manual merge

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Null merge.

  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.


tests/mysql_client_test.c:
  Disable test case.

	databases from 4.0 server

mysqldump treated a failure to set the results charset as a severe
error.  

Now, don't try to set the charset for the SHOW CREATE TABLE statement,
if remote server's version is earlier than 4.1, which means it 
doesn't support changing charsets.


client/mysqldump.c:
  Don't set the charset for receiving results if the server doesn't 
  support it.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

	table with backticks

(Thanks to Lu Jingdong, though I did not take his patch directly, as
it contained a significant flaw.)

It wasn't a backtick/parsing problem.  We merely didn't anticipate
and allocate enough space to handle the optional "#mysql50#" table-
name prefix. 

Now, allocate that extra space in case we need it when we look up 
a legacy table to get its file's name.


mysql-test/r/drop.result:
  Verify that databases with old-style files can be removed.
mysql-test/t/drop.test:
  Verify that databases with old-style files can be removed.
sql/sql_db.cc:
  Extend the size of the memory that holds the table's name, so that
  the legacy "mysql50" prefix fits.

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

bug12713.

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean