into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Merge 5.0->5.1
mysql-test/r/binlog_stm_binlog.result:
  Merge 5.0->5.1

to crrectly filter tests to run

mysql-test/lib/mtr_cases.pl:
  Don't turn off binlog in versions prior to 5.0
mysql-test/r/binlog.result:
  Update result after adding "one more select"
mysql-test/t/binlog.test:
  Update result after adding "one more select"

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


mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged

 - Fix test to work on OS where backslashes are forward


mysql-test/include/uses_vardir.inc:
  Make the test work on windows too

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/sp-code.test:
  Auto merged

BitKeeper/deleted/.del-is_debug_build.inc:
  Rename: mysql-test/include/is_debug_build.inc -> BitKeeper/deleted/.del-is_debug_build.inc

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/include/master-slave.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Merge 5.0->5.1
mysql-test/t/binlog_killed.test:
  Merge 5.0->5.1

Mark one more test as needing binlog


mysql-test/include/master-slave.inc:
  Fix typo
mysql-test/lib/mtr_cases.pl:
  Fix typo
mysql-test/r/have_log_bin.require:
  Fix typo
mysql-test/t/binlog_killed.test:
  Need binlog

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/triggers/pre-commit:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_binlog_basic2.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/t/blackhole.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged

 - Additional tests in 5.1 that need binlog
 - Mark more test to need binlog


mysql-test/include/have_binlog_format_mixed.inc:
  Need binlog
mysql-test/include/have_binlog_format_mixed_or_row.inc:
  Need binlog
mysql-test/include/have_binlog_format_row.inc:
  Need binlog
mysql-test/include/have_binlog_format_statement.inc:
  Need binlog
mysql-test/r/date_formats.result:
  Show only the variables affected by the testcase to avoid it fails
  when running without binlog
mysql-test/t/date_formats.test:
  Show only the variables affected by the testcase to avoid it fails
  when running without binlog
mysql-test/t/ndb_binlog_basic2.test:
  Need binlog
mysql-test/t/ps.test:
  Need binlog
mysql-test/t/rpl_sf.test:
  Nedd binlog

into  pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369


mysql-test/include/master-slave.inc:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
BitKeeper/deleted/.del-sp_trans_log.test:
  Delete: mysql-test/t/sp_trans_log.test
BitKeeper/deleted/.del-sp_trans_log.result:
  Delete: mysql-test/r/sp_trans_log.result
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3:
  SCCS merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  SCCS merged
mysql-test/extra/binlog_tests/binlog.test:
  Merge 5.0->5.1
mysql-test/lib/mtr_cases.pl:
  Merge 5.0->5.1
mysql-test/r/sp_trans.result:
  Merge 5.0->5.1
mysql-test/t/mysqlbinlog2.test:
  Merge 5.0->5.1
mysql-test/t/rpl000017.test:
  Merge 5.0->5.1
mysql-test/t/rpl_000015.test:
  Merge 5.0->5.1
mysql-test/t/user_var-binlog.test:
  Merge 5.0->5.1

 - Turn on binlog only for tests that need it
 - Skip those tests if --skip-binlog is used


BitKeeper/deleted/.del-ctype_cp932_notembedded.result:
  Rename: mysql-test/r/ctype_cp932_notembedded.result -> BitKeeper/deleted/.del-ctype_cp932_notembedded.result
BitKeeper/deleted/.del-ctype_cp932_notembedded.test:
  Rename: mysql-test/t/ctype_cp932_notembedded.test -> BitKeeper/deleted/.del-ctype_cp932_notembedded.test
mysql-test/include/master-slave.inc:
  Need binlog
mysql-test/lib/mtr_cases.pl:
  Turn on binlog only for tests that need it
  Skip those tests if --skip-binlog is used
mysql-test/r/sp_trans.result:
  Moved to "sp_binlog"
mysql-test/t/binlog.test:
  Need binlog
mysql-test/t/blackhole.test:
  Need binlog
mysql-test/t/ctype_cp932_binlog.test:
  Need binlog
mysql-test/t/ctype_ucs_binlog.test:
  Need binlog
mysql-test/t/drop_temp_table.test:
  Need binlog
mysql-test/t/flush_block_commit_notembedded.test:
  Need binlog
mysql-test/t/innodb.test:
  Need binlog
mysql-test/t/insert_select-binlog.test:
  Need binlog
mysql-test/t/mix_innodb_myisam_binlog.test:
  Need binlog
mysql-test/t/mysqlbinlog-cp932.test:
  Need binlog
mysql-test/t/mysqlbinlog.test:
  Need binlog
mysql-test/t/mysqlbinlog2.test:
  Need binlog
mysql-test/t/mysqldump.test:
  Need binlog
mysql-test/t/rpl000015.test:
  Need binlog
mysql-test/t/rpl000017.test:
  Need binlog
mysql-test/t/rpl_rotate_logs.test:
  Need binlog
mysql-test/t/sp_trans.test:
  Moved to "sp_binlog"
mysql-test/t/user_var-binlog.test:
  Need binlog
mysql-test/r/sp_trans_log.result:
  New BitKeeper file ``mysql-test/r/sp_trans_log.result''
mysql-test/t/sp_trans_log.test:
  New BitKeeper file ``mysql-test/t/sp_trans_log.test''

BitKeeper/triggers/pre-commit:
  Turn off EOLN_NATIVE flag

into  xp.:C:/work/mysql-5.1-new-maint


sql-common/client.c:
  Auto merged

BitKeeper/triggers/pre-commit:
  Turn off EOLN_NATIVE flag

into  xp.:C:/work/mysql-5.0-maint

The events were not being opened in the global namespace.


sql-common/client.c:
  Add Global\\ to the event names so they are opened in the global namespace

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/backup.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

 - Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR


mysql-test/t/backup.test:
  Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
mysql-test/t/blackhole.test:
  Skip test if the mysqld to test is not started from MYSQLTEST_VARDIR
mysql-test/include/uses_vardir.inc:
  New BitKeeper file ``mysql-test/include/uses_vardir.inc''

into  mysql.com:/home/ram/work/b28806/b28806.5.1

Problem: getting an autoincrement value for a partition table in the ::info() method we call
the get_auto_increment() for all partitions. That may cause a problem for at least MyISAM
tables that rely on some table state (in this particular case table->naxt_nuber_field is 
set to 0 in the mysql_insert() and we get a crash). 
Moreover, calling get_auto_increment() is superfluous there.

Fix: use ::info(HA_STATUS_AUTO) calls to get autoincrement values for partitions instead of
get_auto_increment() ones in the ha_partition::info().


mysql-test/r/partition.result:
  Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
    - test result.
mysql-test/t/partition.test:
  Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
    - test case.
sql/ha_partition.cc:
  Fix for bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
    - use info(HA_STATUS_AUTO) calls to get autoincrement values for partitions,
      set the auto_increment_value as the biggest one.

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

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

This is to fix PB failures introduced by the patch for bug #28895.


mysql-test/r/view_grant.result:
  Fixed tests that relied on broken behavior in acl_getroot_no_password().

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/bug28690/my51-bug28690


mysys/my_thr_init.c:
  Merge 5.0->5.1

 - Only use the "hack for bug in NTPL" if using NTPL, by dynamically
   checking the thd_lib_detected flag


mysys/my_thr_init.c:
  Only start the "dummy thread hack for bug in NPTL" - if using NPTL.
  If the system uses LinuxThreads it's not needed, it actually causes 
  the "pthread manager" to be started as root and thus all subsequent
  threads will also run as root although mysqld drops root privileges, 
  this in turns causes mysqld to deadlock since the mysqlds main thread
  running as <user> can't send signals to a process owned by root.

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


configure.in:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


configure.in:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint