1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Manual merge

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

View File

@ -10,15 +10,13 @@ SELECT 1;
1
# Switch to connection con2
FLUSH TABLES WITH READ LOCK;
SHOW MASTER STATUS;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 107
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
# Switch to connection con1
INSERT INTO t1 VALUES (1);
# Switch to connection con2
SHOW MASTER STATUS;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 107
show binlog events from <binlog_start>;
Log_name Pos Event_type Server_id End_log_pos Info
UNLOCK TABLES;
# Switch to connection con1
DROP TABLE t1;