into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

mysql-test/t/disabled.def:
  Removed reference to  failed test.
sql/ha_archive.cc:
  This fixes the optimize problem introduced in a bad merge.

support-files/mysql.spec.sh:
  - Use "-i" on "make test-force",
  - document other recent changes in the changelog section (where notes were missing).

BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.


mysql-test/r/rpl_loaddata2.result:
  Cleanup
mysql-test/r/rpl_redirect.result:
  Cleanup
mysql-test/r/rpl_slave_status.result:
  Cleanup
mysql-test/t/rpl_LD_INFILE.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_drop_temp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ignore_table.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata2.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_m.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_s.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loadfile.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_multi_update4.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ndb_basic.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_redirect.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp005.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp008.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp009.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp010.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp011.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp012.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_skip_error.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_slave_status.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp004.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


sql/set_var.cc:
  manual merge.

  Fix out-of-order system variable.


sql/set_var.cc:
  Fix out-of-order system variable.

    "Use remote": Let the other changes (test the debug binary) precede.


support-files/mysql.spec.sh:
  "Use remote": Let the other changes (test the debug binary) precede.

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

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

into  selena.:H:/MYSQL/src/#00001-mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

wrong arrGuard, see MAX_REPLICAS+1 0n row 6457
+ changed all 4 constants to MAX_REPLICAS
+ moved some arrGuards out of loops for optim reasons

into  selena.:H:/MYSQL/src/#00001-mysql-5.1

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Disabling a test, I will look at it tomorrow. Something is wrong with the merge from 5.0. Its probably a flush that is missing somewhere but I am too tired to figure it out at the moment.


mysql-test/t/disabled.def:
  Disabling test.
sql/ha_archive.cc:
  Corrected compile problem

sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

client/Makefile.am:
  Additional linking
client/mysqlimport.c:
  Removed undef

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1


sql/ha_archive.h:
  Auto merged
sql/ha_archive.cc:
  Merge to  change gzio to azio. Good thing I am not lazy about doing merges  since I suspect this might have given someone else a headache.

Discoved while debugging in 5.1 that there was a bug where a certain crash could lead to two problems. 1) An additional share in memory that was allocated but did not have the correct use_count (so it would never be fulled deleted). Also discovered that a thread that called repair would write new rows, but would not see them. All other threads were ok, and the data was fine, but the thread doing the repair was unable to see the new rows.


sql/ha_archive.cc:
  Fix for leaked share and hidden rows.
sql/ha_archive.h:
  Change in method

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

Cleanup's from Kostja's review. Plus I added a bit more documentation to the --lock-tables option. If selected it disables threads (since you can't quite do it with threads).


client/mysqlimport.c:
  Cleanups from Kostja's review

'--log-bin-trust-function-creators' affects not only replication of the
stored functions, but also replication of the triggers.


sql/mysqld.cc:
  Updated the description of mysqld '--log-bin-trust-function-creators' option
  to reflect that after introducing TRIGGER privilege this option also controls
  replication of triggers.
sql/sql_trigger.cc:
  Updated the comment to be consistent with the new behaviour,
  introduced by TRIGGER privilege.

add optional reporting of of a "name" tied to a nodeid in the cluster log
reporting added for mysql server and ndb_restore

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this.


client/Makefile.am:
  Adding client_thread_libs for mysqlimport (aka it gets pthreads)
client/client_priv.h:
  New option
client/mysqlimport.c:
  Reworked logic to allow someone to use threads.
mysql-test/r/mysqldump.result:
  New results
mysql-test/t/mysqldump.test:
  Added tests for threads.

into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  new file
Many files:
  WL#757 RENAME DATABASE


sql/mysql_priv.h:
  WL#757 RENAME DATABASE
sql/mysqld.cc:
  WL#757 RENAME DATABASE
sql/sql_db.cc:
  WL#757 RENAME DATABASE
sql/sql_lex.h:
  WL#757 RENAME DATABASE
sql/sql_parse.cc:
  WL#757 RENAME DATABASE
sql/sql_rename.cc:
  WL#757 RENAME DATABASE
sql/sql_table.cc:
  WL#757 RENAME DATABASE
sql/sql_yacc.yy:
  WL#757 RENAME DATABASE

sql/mysql_priv.h:
  Removing isam option
sql/mysqld.cc:
  Removing isam option
sql/set_var.cc:
  Removing isam option.