Commit 4fcc3dd8 authored by unknown's avatar unknown

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/svoj/devel/yassl-mysql-5.0

parents b665bfa5 172c03c8
This diff is collapsed.
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
############################################################### ###############################################################
# Some preparations # Some preparations
############################################################### ###############################################################
# The sync_slave_with_master is needed to make the xids deterministic.
sync_slave_with_master;
connection master;
SET AUTOCOMMIT = 1; SET AUTOCOMMIT = 1;
# #
# 1. DROP all objects, which probably already exist, but must be created here # 1. DROP all objects, which probably already exist, but must be created here
...@@ -253,6 +257,8 @@ let $my_slave_commit= false; ...@@ -253,6 +257,8 @@ let $my_slave_commit= false;
--source include/rpl_stmt_seq.inc --source include/rpl_stmt_seq.inc
# With prior read locking # With prior read locking
# Note that this test generate an error since the rpl_stmt_seq.inc
# tries to insert into t1.
LOCK TABLES mysqltest1.t1 READ; LOCK TABLES mysqltest1.t1 READ;
let $my_stmt= UNLOCK TABLES; let $my_stmt= UNLOCK TABLES;
let $my_master_commit= false; let $my_master_commit= false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment