mysql-test/include/ndb_backup.inc:
  We are writting test cases that use the ndb backup. This new include contains all the code needed to start the backup and grab the backup ID for the test. By moving the code here it will be easy to reuse
mysql-test/include/ndb_restore_master.inc:
  We are writting test cases that use the ndb backup and restore. This new include contains all the code needed to restore a master cluster from the backup done with ndb_backup.inc. By moving the code here it will be easy to reuse
mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas

BitKeeper/deleted/.del-rpl_row_multi_update3.test~fcf9a2234bd0f1b:
  Delete: mysql-test/t/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.test~b366698f8379f38f:
  Delete: mysql-test/extra/rpl_tests/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.result~1a3a8438eaaf11f2:
  Delete: mysql-test/r/rpl_row_multi_update3.result
mysql-test/t/rpl_ndb_commit_afterflush.test:
  added comments
mysql-test/r/rpl_ndb_commit_afterflush.result:
  New results file
mysql-test/t/rpl_ddl.test:
  Added to skip default ndb engine
mysql-test/t/rpl_ndb_ddl.test:
  new wrapper for ndb
mysql-test/r/rpl_ndb_ddl.result:
  new wrapper for ndb
mysql-test/t/rpl_insert_ignore.test:
  Added to skip ndb if default engine
mysql-test/t/rpl_ndb_insert_ignore.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_insert_ignore.result:
  New Results file
mysql-test/t/rpl_multi_update2.test:
  Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update2.test:
  New ndb wrapper for test case
mysql-test/t/rpl_ndb_multi_update2-slave.opt:
  New slave option file to go with new NDB test wrapper
mysql-test/r/rpl_ndb_multi_update2.result:
  New results file
mysql-test/t/rpl_multi_update3.test:
  Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update3.test:
  New ndb wrapper for test case
mysql-test/r/rpl_ndb_multi_update3.result:
  New results file
mysql-test/t/rpl_relayrotate.test:
  added comments and ability to sjip when ndb is default engine
mysql-test/t/rpl_ndb_relayrotate.test:
  New wrapper for ndb
mysql-test/t/rpl_ndb_relayrotate-slave.opt:
  New option file for ndb slave
mysql-test/r/rpl_ndb_relayrotate.result:
  New results file
mysql-test/t/rpl_loaddata.test:
  Updated
mysql-test/t/rpl_multi_update.test:
  Updated
mysql-test/t/rpl_relay_space_myisam.test:
  Updated
mysql-test/t/rpl_row_001.test:
  Updated
mysql-test/t/rpl_row_blob_myisam.test:
  Updated
mysql-test/t/rpl_row_charset.test:
  Updated
mysql-test/t/rpl_row_delayed_ins.test:
  Updated
mysql-test/t/rpl_row_log.test:
  Updated
mysql-test/t/rpl_row_UUID.test:
  Updated
mysql-test/t/rpl_auto_increment.test:
  Updated
mysql-test/t/rpl_commit_after_flush.test:
  Updated
mysql-test/t/rpl_deadlock_innodb.test:
  Updated
mysql-test/t/rpl_failed_optimize.test:
  Updated
mysql-test/t/rpl_foreign_key_innodb.test:
  Updated
mysql-test/t/rpl_insert_id_pk.test:
  Updated
mysql-test/t/rpl_insert_id.test:
  Updated
mysql-test/t/rpl_relay_space_innodb.test:
  Updated
mysql-test/t/rpl_row_blob_innodb.test:
  Updated
mysql-test/t/rpl_row_func003.test:
  Updated
mysql-test/t/rpl_row_log_innodb.test:
  Updated
mysql-test/t/rpl_row_sp002_innodb.test:
  Updated
mysql-test/t/rpl_row_sp003.test:
  Updated
mysql-test/t/rpl_row_sp006_InnoDB.test:
  Updated
mysql-test/t/rpl_row_sp007_innodb.test:
  Updated
mysql-test/t/rpl_ndb_row_001.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_row_001.result:
  New results file
mysql-test/t/rpl_ndb_UUID.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_UUID.result:
  New results file
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
  Updated with order by
mysql-test/r/rpl_row_delayed_ins.result:
  Updated results file
mysql-test/t/rpl_ndb_charset.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_charset.result:
  New results file
mysql-test/t/rpl_row_until.test:
  Updated to skip when ndb is default. ndb bin logs are different size, so test would need to be rewitten for ndb
mysql-test/t/rpl_row_max_relay_size.test:
  Updated
mysql-test/t/rpl_row_sp008.test:
  Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_sp008.result:
  Updated results
mysql-test/t/rpl_row_basic_11bugs.test:
  Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_basic_11bugs.result:
  Updated results
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.test~afa6834a51627676:
  Delete: mysql-test/t/rpl_ndb_max_relay_size.test
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.result~1e944e2782e270d8:
  Delete: mysql-test/r/rpl_ndb_max_relay_size.result
mysql-test/t/disabled.def:
  Updated

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

sql/event.cc:
  - make this not unsigned. gcc complains
sql/event_timed.cc:
  acl_getroot_no_password() is not there in libmysqld, disable it's usage
  in this case.
sql/set_var.cc:
  fix for the broken build of Serg. gcc seems to be pretty happy without
  the return and returns the value of the last statement

sql/event_timed.cc:
  - fix comment
  - use mysql_change_db() this will check for us

mysql-test/r/events.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/event.h:
  Auto merged
sql/event_timed.cc:
  manual merge

mysql-test/r/events.result:
  result fixed
sql/event_executor.cc:
  cosmetic changes to show the definer of the event

into lmy004.:/work/mysql-5.1-bug16410

into lmy004.:/work/mysql-5.1-bug16410

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

into lmy004.:/work/mysql-5.1-bug17289

into lmy004.:/work/mysql-5.1-bug16410

WL#1034 (Internal CRON)
(post-post-review updates)



mysql-test/r/events.result:
  update results file
mysql-test/t/events.test:
  add test for Bug #16410  Events: CREATE EVENT is legal in a CREATE TRIGGER statement
sql/sp_head.cc:
  CREATE/ALTER/DROP event mean explicit commit, so they are not allowed in
  a FUNCTION/TRIGGER. Fixes bug#16410
sql/sql_parse.cc:
  - end active transaction for CREATE/ALTER/DROP EVENT because
    they are DDL statements.

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

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

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged

into lmy004.:/work/mysql-5.1-bug17289

 - Change 94 to 95 according to Pem's instructions in bug report.


mysql-test/r/sp-code.result:
  Update from 94 to 95 according to Pem's instructions
mysql-test/t/disabled.def:
  Enable sp-code test case

Second submission of this test case. First one was lost and test had to be recreated from first bk commit. Test current produces core due to Bug #17045


mysql-test/t/ndb_dd_backuprestore.test:
  Recovered new CDD test
mysql-test/r/ndb_dd_backuprestore.result:
  Results will need to be recreated once bug #17045 is patched
mysql-test/t/disabled.def:
  Added ndb_dd_backuprestore

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/t/rpl_ndb_delete_nowhere.test:
  new wrapper for NDB engine
mysql-test/r/rpl_ndb_delete_nowhere.result:
  new reults file
mysql-test/t/disabled.def:
  Added test to be diabled
mysql-test/t/rpl_delete_no_where.test:
  Fix typo
mysql-test/t/rpl_EE_err.test:
  Updated wrapper
mysql-test/extra/rpl_tests/rpl_trig004.test:
  Updated
mysql-test/t/rpl_row_trig004.test:
  Updated
mysql-test/r/rpl_row_trig004.result:
  Updated
mysql-test/t/rpl_ndb_trig004.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_trig004.result:
  New result

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work


sql/sql_partition.cc:
  Auto merged

sql/event_executor.cc:
  cosmetic changes of the fix for bug#17289, before push

  In presense of subpartitioning use get_part_partition_id() to calculate part_id

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work


sql/sql_partition.cc:
  Auto merged

  use part_info->no_subparts to calculate partition range in case of subpartitions


mysql-test/r/partition.result:
  Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key
    test case
mysql-test/t/partition.test:
  Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key
    test case

This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions.
Also added a flush table test as well. Found one possible bug in OPTIMIZE TABLE which has never been reported, but I think it would be possible on a file system that ran out of disk.


mysql-test/r/archive.result:
  New results
mysql-test/t/archive.test:
  Added test for flush tables, which will also let me confirm DELAYED INSERT.
sql/ha_archive.cc:
  Adding new stat
sql/ha_archive.h:
  Just extending SHARE

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new

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

mysql-test/r/binlog_stm_ctype_ucs.result:
  BUG#16217 character_name mysql client command is generated by
  mysqlbinlog which is called from this test

dbug/dbug.c:
  post-merge fixes (-#T in explain was forgotten)
sql/set_var.h:
  post-merge fixes (DBUG_POP() is the correct way to restore default settings now)

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new

sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysqlslap.c:
  SCCS merged
configure.in:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
mysys/my_init.c:
  SCCS merged

into lmy004.:/work/mysql-5.1-bug17289


sql/event_executor.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


sql/sql_plugin.h:
  Auto merged
include/mysql/plugin.h:
  Auto merged

1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log


BitKeeper/deleted/.del-readme.prof~2f3bae1550a0038d:
  Delete: dbug/readme.prof
client/mysqlslap.c:
  typo fixed
configure.in:
  test for sleep() too
dbug/dbug.c:
  thread local dbug settings
  DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
  style changes to be more in line with MySQL code
  cleanup (many mallocs removed)
  incremental modification of dbug state (e.g. DBUG_PUSH("+t:-d,info"))
  DBUG_SET, _db_explain_
  -#T
dbug/monty.doc:
  obsolete and duplicate docs removed
dbug/user.r:
  new features documented
include/my_dbug.h:
  correct do{}while wrapping
  thread local dbug settings
  DBUG_EXPLAIN,DBUG_EXPLAIN_INITIAL,DBUG_SET,DBUG_SET_INITIAL
  DBUG_EVALUATE,DBUG_EVALUATE_IF
libmysql/libmysql.c:
  remove _db_on_ and DEBUGGER_ON/OFF
mysys/my_init.c:
  missed DBUG_RETURN
mysys/my_thr_init.c:
  bugfix - transaction id's are unsigned
mysys/testhash.c:
  remove _db_on_ and DEBUGGER_ON/OFF
sql/ha_myisammrg.cc:
  missed ;
sql/ha_ndbcluster.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
  missed ;
sql/ha_ndbcluster_binlog.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
  missed ;
sql/item_cmpfunc.cc:
  missed ;
sql/lock.cc:
  missed DBUG_RETURN
sql/log_event.cc:
  missed ;
sql/mysqld.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
  missed ;
  DBUG_SET_INITIAL
sql/opt_range.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
sql/set_var.cc:
  class sys_var_thd_dbug and "debug" server variable
sql/set_var.h:
  class sys_var_thd_dbug and "debug" server variable
sql/slave.cc:
  missed ;
sql/sql_cache.cc:
  missed ;
sql/sql_plugin.cc:
  missed ;
sql/sql_select.cc:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/heap/hp_test2.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_eval.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/ft_test1.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_open.c:
  remove _db_on_ and DEBUGGER_ON/OFF
  missed ;
storage/myisam/mi_test1.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test2.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/myisam/mi_test3.c:
  remove _db_on_ and DEBUGGER_ON/OFF
storage/ndb/src/ndbapi/DictCache.cpp:
  missed ;
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  missed ;
tests/mysql_client_test.c:
  remove _db_on_ and DEBUGGER_ON/OFF