1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Manual merge

This commit is contained in:
unknown
2010-05-26 22:34:25 +08:00
198 changed files with 3603 additions and 10089 deletions

View File

@@ -28,14 +28,14 @@ SELECT 1;
--echo # Switch to connection con2
connection con2;
FLUSH TABLES WITH READ LOCK;
SHOW MASTER STATUS;
--source include/show_binlog_events.inc
--echo # Switch to connection con1
connection con1;
send INSERT INTO t1 VALUES (1);
--echo # Switch to connection con2
connection con2;
sleep 1;
SHOW MASTER STATUS;
--source include/show_binlog_events.inc
UNLOCK TABLES;
--echo # Switch to connection con1
connection con1;