diff options
author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-03-22 15:38:41 +0100 |
---|---|---|
committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-03-22 15:38:41 +0100 |
commit | 761ba8349de904d708595a82f826f2558e8785a0 (patch) | |
tree | d4c903e1ddbf4535e71a1a68e19d32afc13e548c /mysql-test/suite/rpl/r/rpl_stop_slave.result | |
parent | c85237485a4cfe5ff87d16007503882afe77ea5d (diff) | |
parent | 015f7bcf0ce70957f66b2b6580ffcc8cc9f00c7a (diff) | |
download | mariadb-git-761ba8349de904d708595a82f826f2558e8785a0.tar.gz |
merge from 5.1 main
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_stop_slave.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_stop_slave.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stop_slave.result b/mysql-test/suite/rpl/r/rpl_stop_slave.result index ff0061f264b..7ea613fedd6 100644 --- a/mysql-test/suite/rpl/r/rpl_stop_slave.result +++ b/mysql-test/suite/rpl/r/rpl_stop_slave.result @@ -146,6 +146,7 @@ DROP TABLE t1, t2; CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB; CREATE TABLE t2 (c1 INT) ENGINE=MyISAM; INSERT INTO t1 VALUES(1, 1); +[connection master] SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid'; [connection slave] include/restart_slave.inc |