diff options
| author | Mats Kindahl <mats@mysql.com> | 2008-09-01 11:00:52 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@mysql.com> | 2008-09-01 11:00:52 +0200 |
| commit | d6d2f77f06327303748beea2d8549c83774174f0 (patch) | |
| tree | 4df0a0ec0f33803b1f9c44ef016a725568ea3c3c /mysql-test/suite | |
| parent | c0de944fdb2cff16b1ca9cc344e356f68c38d90a (diff) | |
| parent | 7258de3862459350911b404bb8a9213761931f5a (diff) | |
| download | mariadb-git-d6d2f77f06327303748beea2d8549c83774174f0.tar.gz | |
Merging 5.0-bugteam into 5.1-bugteam
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_stm_log.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_stm_log-slave.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_view-slave.opt | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result index d29b4c92590..20f8e04afe7 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_log.result +++ b/mysql-test/suite/rpl/r/rpl_stm_log.result @@ -7,7 +7,7 @@ start slave; stop slave; reset master; reset slave; -reset master; +start slave; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM; insert into t1 values (NULL); drop table t1; @@ -109,7 +109,6 @@ Aberdeen Abernathy aberrant aberration -start slave; let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ; diff --git a/mysql-test/suite/rpl/t/rpl_stm_log-slave.opt b/mysql-test/suite/rpl/t/rpl_stm_log-slave.opt index 8b137891791..203fc2287ec 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_log-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_stm_log-slave.opt @@ -1 +1 @@ - +--log-slave-updates diff --git a/mysql-test/suite/rpl/t/rpl_view-slave.opt b/mysql-test/suite/rpl/t/rpl_view-slave.opt deleted file mode 100644 index 79b3bf6174b..00000000000 --- a/mysql-test/suite/rpl/t/rpl_view-slave.opt +++ /dev/null @@ -1 +0,0 @@ ---replicate-ignore-table=test.foo |