diff options
| -rw-r--r-- | .bzrignore | 18 | ||||
| -rw-r--r-- | mysql-test/r/rpl_rotate_logs.result (renamed from mysql-test/r/rpl000016.result) | 0 | ||||
| -rw-r--r-- | mysql-test/t/rpl000018.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs-master.opt (renamed from mysql-test/t/rpl000016-master.opt) | 0 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs-slave-master-info.opt (renamed from mysql-test/t/rpl000016-slave-master-info.opt) | 0 | ||||
| -rwxr-xr-x | mysql-test/t/rpl_rotate_logs-slave.sh (renamed from mysql-test/t/rpl000016-slave.sh) | 0 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.test (renamed from mysql-test/t/rpl000016.test) | 0 |
7 files changed, 14 insertions, 9 deletions
diff --git a/.bzrignore b/.bzrignore index 8022245b859..6cfd4bcac5b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -284,6 +284,7 @@ libmysqld/password.c libmysqld/procedure.cc libmysqld/records.cc libmysqld/repl_failsafe.cc +libmysqld/set_var.cc libmysqld/simple-test libmysqld/slave.cc libmysqld/sql_acl.cc @@ -357,6 +358,8 @@ myisam/myisamlog myisam/myisampack myisam/test1.MYD myisam/test1.MYI +myisam/test2.MYD +myisam/test2.MYI mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-4.0.2-alpha.tar.gz mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz @@ -424,6 +427,12 @@ sql-bench/copy-db sql-bench/crash-me sql-bench/gif/* sql-bench/graph-compare-results +sql-bench/innotest1 +sql-bench/innotest1a +sql-bench/innotest1b +sql-bench/innotest2 +sql-bench/innotest2a +sql-bench/innotest2b sql-bench/output/* sql-bench/run-all-tests sql-bench/server-cfg @@ -485,12 +494,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -sql-bench/innotest1 -sql-bench/innotest1a -sql-bench/innotest1b -sql-bench/innotest2 -sql-bench/innotest2a -sql-bench/innotest2b -myisam/test2.MYD -myisam/test2.MYI -libmysqld/set_var.cc diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl_rotate_logs.result index 01e6d2c3a48..01e6d2c3a48 100644 --- a/mysql-test/r/rpl000016.result +++ b/mysql-test/r/rpl_rotate_logs.result diff --git a/mysql-test/t/rpl000018.test b/mysql-test/t/rpl000018.test index 30d601bb375..291b482b912 100644 --- a/mysql-test/t/rpl000018.test +++ b/mysql-test/t/rpl000018.test @@ -1,3 +1,8 @@ +# +# Running test with abort-slave-event-count=1 +# This will force slave to reconnect after every event +# + require_manager; connect (master,localhost,root,,test,0,master.sock); connect (slave,localhost,root,,test,0,slave.sock); diff --git a/mysql-test/t/rpl000016-master.opt b/mysql-test/t/rpl_rotate_logs-master.opt index f27601e0d7d..f27601e0d7d 100644 --- a/mysql-test/t/rpl000016-master.opt +++ b/mysql-test/t/rpl_rotate_logs-master.opt diff --git a/mysql-test/t/rpl000016-slave-master-info.opt b/mysql-test/t/rpl_rotate_logs-slave-master-info.opt index 80190bf6d29..80190bf6d29 100644 --- a/mysql-test/t/rpl000016-slave-master-info.opt +++ b/mysql-test/t/rpl_rotate_logs-slave-master-info.opt diff --git a/mysql-test/t/rpl000016-slave.sh b/mysql-test/t/rpl_rotate_logs-slave.sh index 9259f593e54..9259f593e54 100755 --- a/mysql-test/t/rpl000016-slave.sh +++ b/mysql-test/t/rpl_rotate_logs-slave.sh diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl_rotate_logs.test index fa0c38ae993..fa0c38ae993 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl_rotate_logs.test |