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


mysql-test/t/disabled.def:
  Auto merged

into  mysql.com:/space/pekka/ndb/version/my51

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

- also accept setting up binlog for tables in stateBackup

mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas
mysql-test/include/ndb_restore_master.inc:
  corrected issues with using cygwin to create
mysql-test/include/ndb_backup.inc:
  corrected issues with using cygwin to create

sql/ha_ndbcluster_binlog.cc:
  use_table at beginning of epoch
storage/ndb/include/ndbapi/Ndb.hpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/Ndb.cpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  getGCIEventOperations: return distinct event ops at epoch start

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

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

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

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


client/mysqldump.c:
  Auto merged

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


sql/sql_show.cc:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

mysql-test/r/information_schema.result:
  Fixing results after PROCESSLIST information schema is added.
mysql-test/r/information_schema_db.result:
  Fixing results after PROCESSLIST information schema is added.
mysql-test/t/information_schema.test:
  Test case to check PROCESSLIST information schema.
    (Note that selecting other fields from PROCESSLIST
    can make the test unstable).
sql/sql_show.cc:
  Code for PROCESSLIST information schema
sql/table.h:
  Added for PROCESSLIST informarion schema

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

| INTERVAL_VALUE | INTERVAL_FIELD |
| 20             | 20 MINUTE      |
the second one should be without the value


mysql-test/r/events.result:
  update test result to be as they should be
sql/event_timed.cc:
  manually append the name of the interval because it's no more appended
  by reconstruct_value

into  perch.ndb.mysql.com:/home/jonas/src/51-clean

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Merge

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333


mysys/thr_mutex.c:
  Auto merged

mysql-test/t/disabled.def:
  Disable ndb_load again...

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.1-bug8841

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new


storage/ndb/include/util/File.hpp:
  Auto merged
storage/ndb/src/common/portlib/NdbConfig.c:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname

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

(pre-push)


mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  few more tests
sql/event.cc:
  fix compilation failure after big merge
sql/event.h:
  initialize s_ctx to be the context to be used.
  don't use sphead->m_security_ctx but we will copy 
  the initted ctx to there
sql/event_timed.cc:
  -initialize s_ctx to be the context to be used.
  don't use sphead->m_security_ctx but we will copy 
  the initted ctx to there
  
  - first init the context
  - then compile the event
  - and then copy the context
  - don't use mysql_change_db() for now change_security_context() gets the
    right context info

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  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged