mysql-test/t/rpl_ndb_2innodb.test:
New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2myisam.test:
New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2innodb-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2innodb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb.test:
New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_myisam2ndb.test:
New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_innodb2ndb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
New rpl ndb test supporting option files
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
New test code that drives the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/include/rpl_multi_engine3.inc:
New include that cover repeating code of the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/t/disabled.def:
Updated to include new test cases that have outstanding bug reports.
into mysql.com:/home/my/mysql-5.1
BitKeeper/deleted/.del-innodb_notembedded.test:
Delete: mysql-test/t/innodb_notembedded.test
BitKeeper/deleted/.del-sp_notembedded.test:
Delete: mysql-test/t/sp_notembedded.test
BitKeeper/deleted/.del-subselect_notembedded.test:
Delete: mysql-test/t/subselect_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result:
Delete: mysql-test/r/ctype_cp932_notembedded.result
BitKeeper/deleted/.del-innodb_notembedded.result:
Delete: mysql-test/r/innodb_notembedded.result
BitKeeper/deleted/.del-sp_notembedded.result:
Delete: mysql-test/r/sp_notembedded.result
BitKeeper/deleted/.del-subselect_notembedded.result:
Delete: mysql-test/r/subselect_notembedded.result
configure.in:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/emb_qcache.cc:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/query_cache_notembedded.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/compress.test:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
mysql-test/t/read_only.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-threads.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/temp_table.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
mysys/mf_dirname.c:
Auto merged
sql/field.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_cursor.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
sql/tztime.h:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
libmysqld/lib_sql.cc:
Manual merge
mysql-test/extra/binlog_tests/binlog.test:
Manual merge
mysql-test/extra/binlog_tests/ctype_cp932.test:
No changes
mysql-test/r/binlog_stm_binlog.result:
Manual merge
mysql-test/r/binlog_stm_ctype_cp932.result:
No changes
mysql-test/t/innodb.test:
Manual merge
mysql-test/t/view.test:
Manual merge
mysys/my_bitmap.c:
Manual merge
scripts/mysql_fix_privilege_tables.sql:
Manual merge
sql/item.cc:
Manual merge
sql/sql_cache.h:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_update.cc:
Manual merge
Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to
separate stm/row test cases, the .opt were not moved along with it,
causing a 60-second test duration because of default lock timeout :-(
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
bk cp mysql-test/t/mix_innodb_myisam_binlog-master.opt mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
Rename: mysql-test/t/mix_innodb_myisam_binlog-master.opt -> mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
mysql-test/r/mysqlbinlog_base64.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_load.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_LD_INFILE.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata2.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata_m.result:
Fix test cases to work with non-standard --vardir.
mysql-test/t/loaddata.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/mysqlbinlog_base64.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_dd_dump.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_load.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_LD_INFILE.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata2.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata_m.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loadfile.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_001.test:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_load_table_from_master.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loadfile.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_row_001.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_001.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_loaddata_m.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_stop_middle_update.result:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_drop_db.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_load_table_from_master.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_stop_middle_update.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_blob.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_func003.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
Fix test cases to work with non-standard --vardir.
mysql-test/include/ndb_backup.inc:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_bank.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_sync.result:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_bank.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_sync.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_NOW.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_func002.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp001.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp011.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig001.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig003.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_sp004.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/show_check.test:
Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_1.inc:
Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_layout.inc:
Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_dd_backuprestore.result:
Fix test cases to work with non-standard --vardir.
"mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
compared with 5.0, this part has to move to the wrappers as the arg of --start-position depends on row-based or statement-based replication
mysql-test/r/binlog_row_mix_innodb_myisam.result:
result update
mysql-test/r/rpl_row_UUID.result:
result update (somebody had forgotten to run row-based tests, the solution is to use "make test" :)
mysql-test/t/binlog_row_mix_innodb_myisam.test:
merge from 5.0
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
merge form 5.0
sql/mysqld.cc:
fix after merge
sql/sp_head.cc:
fix after merge
into mysql.com:/home/mysql_src/mysql-5.1-new
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
into mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/rpl_sp-slave.opt:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
mysql-test/t/sql_mode.test:
Auto merged
sql/set_var.cc:
Auto merged
sql/log.cc:
auto merged
sql/mysqld.cc:
will fix manually
sql/sp_head.cc:
will fix manually
mysql-test/t/disabled.def:
Updated
mysql-test/extra/rpl_tests/rpl_log.test:
Updated and moved drop of tables to end of test to help bin log be more deterministic
mysql-test/r/rpl_row_log.result:
Updated results
mysql-test/r/rpl_row_log_innodb.result:
Updated results
mysql-test/r/rpl_ndb_log.result:
Updated results
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
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
mysql-test/include/not_ndb_default.inc:
New include file to skip certain tests with default engine = ndb
mysql-test/t/rpl_optimize.test:
Updated to skip test when NDB is default engine
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
Updated to skip test when NDB is default engine
BitKeeper/deleted/.del-rpl_ndb_auto_inc-master.opt~e38255d94debc2c8:
Delete: mysql-test/t/rpl_ndb_auto_inc-master.opt
mysql-test/t/rpl_ndb_auto_inc.test:
updated to use with ndb
mysql-test/r/rpl_ndb_auto_inc.result:
New results
mysql-test/t/disabled.def:
Updated to remove rpl_ndb_auto_inc.test
mysql-test/extra/rpl_tests/rpl_row_blob.test:
updated to remove check table, not needed and not supported by ndb engine
mysql-test/t/rpl_ndb_blob2.test:
new ndb wrapper
mysql-test/r/rpl_ndb_blob2.result:
new results
BitKeeper/deleted/.del-raid.test~501e9e00b3c27a55:
Delete: mysql-test/t/raid.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Test change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
New results
mysql-test/r/ctype_ujis.result:
New results
mysql-test/r/innodb_concurrent.result:
New results.
mysql-test/r/rpl_heap.result:
New results
mysql-test/r/warnings.result:
New results
mysql-test/t/ctype_ujis.test:
Fixed ENGINE=, test should now actually function
mysql-test/t/innodb_concurrent.test:
Fixed test for engine
mysql-test/t/rpl_heap.test:
Fixed test for engine
mysql-test/t/system_mysql_db_fix.test:
Fixed setup.
mysql-test/t/warnings.test:
Removed deprecated tests
scripts/fill_func_tables.sh:
Fixed script
scripts/mysql_convert_table_format.sh:
Fixed script
sql/ha_innodb.cc:
Fixed comment
sql/sql_yacc.yy:
Removed deprecated syntax
tests/fork_big.pl:
Fixed scipt
tests/fork_big2.pl:
Fixed script
tests/mail_to_db.pl:
Fixed script
tests/mysql_client_test.c:
Fixed test
mysql-test/t/rpl_trigger.test:
Test cleanup
mysql-test/t/rpl_ndb_sync.test:
Test cleanup
mysql-test/t/rpl_ndb_idempotent.test:
Test cleanup
mysql-test/r/rpl_trigger.result:
Updated result files
mysql-test/r/rpl_ndb_sync.result:
Updated result files
mysql-test/r/rpl_ndb_idempotent.result:
Updated result files
mysql-test/t/rpl_ndb_dd_basic.test:
Rename: mysql-test/t/rpl_ndb_disk.test -> mysql-test/t/rpl_ndb_dd_basic.test
mysql-test/r/rpl_ndb_dd_basic.result:
Rename: mysql-test/t/rpl_ndb_dd_basic.result -> mysql-test/r/rpl_ndb_dd_basic.result
mysql-test/r/rpl_ndb_sp006.result:
New results file
mysql-test/t/rpl_row_sp007_innodb-slave.opt:
Ensure slave tables are created as innodb
mysql-test/t/disabled.def:
updated 17290
mysql-test/r/rpl_ndb_sp007.result:
New results file
mysql-test/t/rpl_ndb_sp007.test:
Added comment
mysql-test/t/rpl_ndb_sp006.test:
Added comment
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
Augmented for use with NDB due to injector thread not populating the bin log before sync with master is done
mysql-test/r/rpl_ndb_sp003.result:
New results file
mysql-test/t/rpl_ndb_sp003.test:
Wrapper to use same code for testing NDB that is used for InnoDB Currently
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_row_log.result:
Auto merged
mysql-test/r/rpl_skip_error.result:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/rpl_skip_error.test:
Auto merged
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a:
Auto merged
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734:
Auto merged
mysql-test/t/rpl_load_from_master.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_row_blob.test:
Changes that Larss requested
mysql-test/r/rpl_row_blob_innodb.result:
Changes that Larss requested
mysql-test/r/rpl_row_blob_myisam.result:
Changes that Larss requested
mysql-test/r/rpl_insert_id.result:
updated results
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
Suggested PK test by Lars
mysql-test/t/rpl_insert_id_pk.test:
Suggested PK test by Lars
mysql-test/t/rpl_insert_id_pk-slave.opt:
Suggested PK test by Lars
mysql-test/r/rpl_insert_id_pk.result:
Suggested PK test by Lars
mysql-test/extra/rpl_tests/rpl_insert_id.test:
updated per lars
mysql-test/extra/rpl_tests/rpl_insert_id.test:
Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/r/rpl_insert_id.result:
Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/t/rpl_skip_error.test:
updated to wrk with ndb
mysql-test/r/rpl_skip_error.result:
updated to wrk with ndb
mysql-test/t/rpl_sporadic_master.test:
updated to wrk with ndb
mysql-test/r/rpl_sporadic_master.result:
updated to wrk with ndb
mysql-test/t/rpl_row_trig002.test:
updated to work with NDB engine
mysql-test/r/rpl_row_trig002.result:
updated to work with NDB engine
mysql-test/t/rpl_temporary.test:
updated to work with NDB engine
mysql-test/r/rpl_temporary.result:
updated to work with NDB engine
mysql-test/extra/rpl_tests/rpl_row_001.test:
updated to work with NDB as default engine
mysql-test/r/rpl_row_001.result:
updated to work with NDB as default engine
mysql-test/t/rpl_row_blob_innodb.test:
Fixed bug in test case
mysql-test/t/rpl_row_blob_innodb-slave.opt:
Added slave option file to ensure correct engine type on slave
mysql-test/r/rpl_row_blob_innodb.result:
Updated results
mysql-test/r/rpl_row_blob_myisam.result:
Updated results
mysql-test/r/rpl_ndb_log.result:
update results file
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_misc_functions.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_m.test:
Auto merged
mysql-test/t/rpl_loaddata_s.test:
Auto merged
mysql-test/t/rpl_misc_functions.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/r/mysqltest.result:
Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
"Use local" when merging 5.0 -> 5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/read_only.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/trigger-compat.result:
Merge 5.0 -> 5.1
into neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl000017.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/r/rpl_stm_flsh_tbls.result:
Auto merged
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Merge 5.0->5.1
mysql-test/t/rpl_failed_optimize.test:
Merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata_m.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata_s.test:
Merge 5.0->5.1
mysql-test/t/rpl_multi_update3.test:
Merge 5.0->5.1
mysql-test/t/rpl_create_database.test:
Updated to pass when other default engines are being used
mysql-test/r/rpl_create_database.result:
Updated to pass when other default engines are being used
mysql-test/t/rpl_row_func003-slave.opt:
new opt file to enusre innodb on slave
mysql-test/t/rpl_replicate_do.test:
Updated with order by for use during ndb testing
mysql-test/r/rpl_replicate_do.result:
Updated with order by for use during ndb testing
mysql-test/t/rpl_redirect.test:
updated with order by
mysql-test/r/rpl_redirect.result:
updated with order by
mysql-test/t/rpl_ndb_func003.test:
New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_ndb_func003.result:
New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_row_sp001.result:
updated with order by
mysql-test/t/rpl_row_sp001.test:
updated with order by
BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f:
Delete: mysql-test/extra/rpl_tests/rpl_row_log.test
mysql-test/extra/rpl_tests/rpl_log.test:
Updated test to ensure that MyISAM, and innodb engines passed even if NDB was used as default engine. Due to diff in bin log output between MyISAM, InnoDB and NDB the file had to use different wrappers and results files.
mysql-test/t/rpl_row_log.test:
part of rpl_log.test check in
mysql-test/r/rpl_row_log.result:
part of rpl_log.test check in
mysql-test/r/rpl_row_log_innodb.result:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-master.opt:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-slave.opt:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb.test:
part of rpl_log.test check in
mysql-test/r/rpl_ndb_log.result:
part of rpl_log.test check in
mysql-test/t/rpl_ndb_log.test:
part of rpl_log.test check in
mysql-test/t/rpl_ndb_log-master.opt:
part of rpl_log.test check in
mysql-test/t/disabled.def:
Updated with MySQL Bugs: #17158
mysql-test/t/rpl000004.test:
Updated test so it would not fail when MyISAM was not default Engine
mysql-test/r/rpl000004.result:
Updated test so it would not fail when MyISAM was not default Engine
mysql-test/extra/rpl_tests/rpl000006.test:
Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl000006.result:
Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl_relay_space_myisam.result:
Rename: mysql-test/r/rpl000005.result -> mysql-test/r/rpl_relay_space_myisam.result
mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
Had to split the test cases out to use for each engine. Reason being that the data goes applies to ndb in different order. So it has to have its own result file and I want to ensure that it is not used for other tests when ndb is used as default engine. Old test case was called rpl000009.test, so it was renamed as well to give the test more meaning
mysql-test/t/rpl_relay_space_innodb-master.opt:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb-slave.opt:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb.test:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_myisam.test:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_ndb_relay_space.test:
Wrapper for old test case called rpl000009.test
mysql-test/r/rpl_ndb_relay_space.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_innodb.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_ndb.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/t/rpl000009.test:
updated to work when ndb is default engine
mysql-test/r/rpl000009.result:
updated to work when ndb is default engine
mysql-test/t/rpl_LD_INFILE.test:
Plan test cleanup
mysql-test/r/rpl_LD_INFILE.result:
Plan test cleanup
mysql-test/t/rpl_auto_increment-slave.opt:
needed to ensure test does not fail if default engine is specified
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
Sorry, forgot to cleanup from debugging
mysql-test/t/rpl_ndb_auto_inc.test:
New wrapper for NDB
mysql-test/t/rpl_ndb_auto_inc-master.opt:
New wrapper for NDB
mysql-test/r/rpl_ndb_auto_inc.result:
New wrapper for NDB
mysql-test/t/disabled.def:
Updated
mysql-test/extra/rpl_tests/rpl_loaddata.test:
Update to use std_data_ln
mysql-test/mysql-test-run.pl:
Add back variable path_mysqltest_log
mysql-test/r/rpl_loaddata.result:
Binlog offset changed when using std_data_ln instead of std_data
mysql-test/r/rpl_stm_log.result:
Binlog offset changed when using std_data_ln instead of std_data
had to add order by
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
had to add order by
mysql-test/r/rpl_foreign_key_innodb.result:
had to add order by
BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
Delete: mysql-test/include/not_ndb_table.inc
BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
Delete: mysql-test/r/not_ndb_table.require
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
Cleanup test for NDB
mysql-test/t/rpl_foreign_key_innodb.test:
Cleanup test for NDB
mysql-test/r/rpl_foreign_key_innodb.result:
Cleanup test for NDB
mysql-test/t/rpl_optimize.test:
setting back to orginal values
mysql-test/extra/rpl_tests/rpl_EE_err.test:
Splitting tests case per Lars review
mysql-test/t/rpl_EE_err.test:
Splitting tests case per Lars review
mysql-test/r/rpl_EE_err.result:
Splitting tests case per Lars review
mysql-test/t/rpl_stm_EE_err2.test:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/r/rpl_stm_EE_err2.result:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
BitKeeper/deleted/.del-rpl_row_EE_err.test~b3d8db3eacbb7af5:
Delete: mysql-test/extra/rpl_tests/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.test~6cd033708a4535db:
Delete: mysql-test/t/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.result~5ad217703f686c4d:
Delete: mysql-test/r/rpl_row_EE_err.result
mysql-test/extra/binlog_tests/ctype_cp932.test:
fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
fixed test result
mysql-test/t/ctype_ucs.test:
fixed test case
sql/sql_show.cc:
Compilation with disabled partitioning is fixed
mysql-test/extra/rpl_tests/rpl_row_blob.test:
New blobs test for RBR
mysql-test/t/rpl_row_blob_innodb.test:
Innodb wrapper for rbr blob test
mysql-test/t/rpl_row_blob_myisam.test:
MyISAM wrapper for rbr blob test
mysql-test/r/rpl_row_blob_myisam.result:
MyISAM result for rbr blob test
mysql-test/r/rpl_row_blob_innodb.result:
Innodb result for rbr blob test
BitKeeper/deleted/.del-rpl_row_view.test~91ced6f754fb06a7:
Delete: mysql-test/t/rpl_row_view.test
BitKeeper/deleted/.del-rpl_row_view.result~7ec7f00e6d6beca9:
Delete: mysql-test/r/rpl_row_view.result
mysql-test/t/rpl_view.test:
Updated to work for both SBR and RBR per lars review comments
mysql-test/r/rpl_view.result:
Updated results file
mysql-test/t/rpl_timezone-master.opt:
Rename: mysql-test/t/rpl_stm_timezone-master.opt -> mysql-test/t/rpl_timezone-master.opt
mysql-test/t/rpl_timezone-slave.opt:
Rename: mysql-test/t/rpl_stm_timezone-slave.opt -> mysql-test/t/rpl_timezone-slave.opt
BitKeeper/deleted/.del-rpl_row_timezone-master.opt~59152d4b828ae88d:
Delete: mysql-test/t/rpl_row_timezone-master.opt
BitKeeper/deleted/.del-rpl_row_timezone-slave.opt~6e899f3565026efd:
Delete: mysql-test/t/rpl_row_timezone-slave.opt
BitKeeper/deleted/.del-rpl_row_timezone.test~eb6bbf4edaa18f2d:
Delete: mysql-test/t/rpl_row_timezone.test
BitKeeper/deleted/.del-rpl_row_timezone.result~ea5c5977bb4da1cf:
Delete: mysql-test/r/rpl_row_timezone.result
mysql-test/r/rpl_timezone.result:
Updated results file
mysql-test/t/rpl_timezone.test:
Remove comment
mysql-test/t/rpl_rewrt_db-slave.opt:
Rename: mysql-test/t/rpl_stm_rewrt_db-slave.opt -> mysql-test/t/rpl_rewrt_db-slave.opt
mysql-test/t/rpl_rewrt_db.test:
Rename: mysql-test/t/rpl_stm_rewrt_db.test -> mysql-test/t/rpl_rewrt_db.test
mysql-test/r/rpl_rewrt_db.result:
Rename: mysql-test/r/rpl_stm_rewrt_db.result -> mysql-test/r/rpl_rewrt_db.result
BitKeeper/deleted/.del-rpl_row_rewrt_db-slave.opt~d63094f08f0f222c:
Delete: mysql-test/t/rpl_row_rewrt_db-slave.opt
BitKeeper/deleted/.del-rpl_row_rewrt_db.test~2aa70363e3b25660:
Delete: mysql-test/t/rpl_row_rewrt_db.test
BitKeeper/deleted/.del-rpl_row_rewrt_db.result~a1f2f21a8d2ed591:
Delete: mysql-test/r/rpl_row_rewrt_db.result
mysql-test/t/rpl_loaddata_m-master.opt:
Rename: mysql-test/t/rpl_stm_loaddata_m-master.opt -> mysql-test/t/rpl_loaddata_m-master.opt
mysql-test/t/rpl_loaddata_m.test:
Updated test to work with both SBR and RBR. RBR show bug. Bug# 15942. Test will be added to disable.def until bug corrected
mysql-test/r/rpl_loaddata_m.result:
new results file for test case
BitKeeper/deleted/.del-rpl_stm_err_ignoredtable.test~bfe9b63deec27fb2:
Delete: mysql-test/t/rpl_stm_err_ignoredtable.test
mysql-test/t/rpl_err_ignoredtable-slave.opt:
Rename: mysql-test/t/rpl_stm_err_ignoredtable-slave.opt -> mysql-test/t/rpl_err_ignoredtable-slave.opt
mysql-test/t/rpl_err_ignoredtable.test:
Updated test to work with both SBR and RBR
mysql-test/r/rpl_err_ignoredtable.result:
Updated results file
mysql-test/t/rpl_user_variables.test:
Works with both SBR and RBR
mysql-test/r/rpl_user_variables.result:
Rename: mysql-test/r/rpl_stm_user_variables.result -> mysql-test/r/rpl_user_variables.result
BitKeeper/deleted/.del-rpl_row_user_variables.result~f7e7536de1d8b8b0:
Delete: mysql-test/r/rpl_row_user_variables.result
BitKeeper/deleted/.del-rpl_stm_user_variables.test~84f68bdef965db77:
Delete: mysql-test/t/rpl_stm_user_variables.test
BitKeeper/deleted/.del-rpl_row_user_variables.test~cca11b4f4d044a26:
Delete: mysql-test/t/rpl_row_user_variables.test
mysql-test/t/rpl_row_log.test:
Updated comment to correct statement
mysql-test/t/disabled.def:
Updated with Bug# 15963
mysql-test/t/rpl_ddl.test:
Updated to work with SBR and RBR
mysql-test/r/rpl_ddl.result:
Updated results
BitKeeper/deleted/.del-rpl_row_ddl.test~d1339fea669fc00a:
Delete: mysql-test/t/rpl_row_ddl.test
BitKeeper/deleted/.del-rpl_row_ddl.result~ce73af252273e6bc:
Delete: mysql-test/r/rpl_row_ddl.result
