mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Manual merge
This commit is contained in:
@@ -67,7 +67,9 @@ insert into temp_table values ("testing temporary tables");
|
||||
create table t1 (s text);
|
||||
insert into t1 values('Could not break slave'),('Tried hard');
|
||||
sync_slave_with_master;
|
||||
source include/show_slave_status2.inc;
|
||||
let $status_items= Master_Log_File, Relay_Master_Log_File;
|
||||
source include/show_slave_status.inc;
|
||||
source include/check_slave_is_running.inc;
|
||||
select * from t1;
|
||||
connection master;
|
||||
flush logs;
|
||||
@@ -138,7 +140,8 @@ purge master logs before (@time_for_purge);
|
||||
source include/show_binary_logs.inc;
|
||||
insert into t2 values (65);
|
||||
sync_slave_with_master;
|
||||
source include/show_slave_status2.inc;
|
||||
source include/show_slave_status.inc;
|
||||
source include/check_slave_is_running.inc;
|
||||
select * from t2;
|
||||
|
||||
#
|
||||
@@ -166,7 +169,8 @@ source include/show_master_status.inc;
|
||||
sync_slave_with_master;
|
||||
select * from t4;
|
||||
|
||||
source include/show_slave_status2.inc;
|
||||
source include/show_slave_status.inc;
|
||||
source include/check_slave_is_running.inc;
|
||||
# because of concurrent insert, the table may not be up to date
|
||||
# if we do not lock
|
||||
lock tables t3 read;
|
||||
|
||||
Reference in New Issue
Block a user