2005-12-22 06:39:02 +01:00
|
|
|
stop slave;
|
|
|
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
|
|
|
reset master;
|
|
|
|
|
reset slave;
|
|
|
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
|
|
|
start slave;
|
BUG#37975: wait_for_slave_* should increase the timeout
Problem 1: tests often fail in pushbuild with a timeout when waiting
for the slave to start/stop/receive error.
Fix 1: Updated the wait_for_slave_* macros in the following way:
- The timeout is increased by a factor ten
- Refactored the macros so that wait_for_slave_param does the work for
the other macros.
Problem 2: Tests are often incorrectly written, lacking a
source include/wait_for_slave_to_[start|stop].inc.
Fix 2: Improved the chance to get it right by adding
include/start_slave.inc and include/stop_slave.inc, and updated tests
to use these.
Problem 3: The the built-in test language command
wait_for_slave_to_stop is a misnomer (does not wait for the slave io
thread) and does not give as much debug info in case of failure as
the otherwise equivalent macro
source include/wait_for_slave_sql_to_stop.inc
Fix 3: Replaced all calls to the built-in command by a call to the
macro.
Problem 4: Some, but not all, of the wait_for_slave_* macros had an
implicit connection slave. This made some tests confusing to read,
and made it more difficult to use the macro in circular replication
scenarios, where the connection named master needs to wait.
Fix 4: Removed the implicit connection slave from all
wait_for_slave_* macros, and updated tests to use an explicit
connection slave where necessary.
Problem 5: The macros wait_slave_status.inc and wait_show_pattern.inc
were unused. Moreover, using them is difficult and error-prone.
Fix 5: remove these macros.
Problem 6: log_bin_trust_function_creators_basic failed when running
tests because it assumed @@global.log_bin_trust_function_creators=1,
and some tests modified this variable without resetting it to its
original value.
Fix 6: All tests that use this variable have been updated so that
they reset the value at end of test.
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
Added connection slave since includ/wait_for_slave_sql_to_stop.inc
does not do that anymore.
mysql-test/extra/rpl_tests/rpl_log.test:
Replaced start slave+wait_slave_status by start_slave.inc
mysql-test/include/reset_master_and_slave.inc:
replaced start/stop slave by start_slave.inc/stop_slave.inc
mysql-test/include/sync_slave_io_with_master.inc:
Improved comments and error message.
mysql-test/include/wait_for_slave_io_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_param.inc:
- Improved usage instructions
- Added more debug info in case of timeout
- Added parameters $slave_param_comparison, $slave_timeout,
$slave_keep_connection, $slave_error_message
mysql-test/include/wait_for_slave_sql_error.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_sql_to_start.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_sql_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_to_start.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_show_pattern.inc:
Removed unused (and error-prone) file
mysql-test/include/wait_slave_status.inc:
Removed unused (and error-prone) file
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
Renamed $keep_connection to $slave_keep_connection.
mysql-test/suite/rpl/t/rpl_bug26395.test:
Replace stop slave by stop_slave.inc
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
Replace start/stop slave by start_slave.inc/stop_slave.inc.
Replace wait_for_slave_param by wait_for_slave_sql_to_stop.inc.
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Renamed $keep_connection to $slave_keep_connection.
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
Replace wait_slave_status by start_slave.inc
mysql-test/suite/rpl/t/rpl_idempotency.test:
Added connection slave since wait_for_slave_sql_to_stop.inc does not
do that any more.
mysql-test/suite/rpl/t/rpl_incident.test:
Replaced wait_for_slave_to_stop by wait_for_slave_sql_to_stop.inc
mysql-test/suite/rpl/t/rpl_init_slave.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl/t/rpl_log_pos.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced wait_for_slave_param by other wait_for_slave_* macros.
mysql-test/suite/rpl/t/rpl_packet.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_until.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl/t/rpl_server_id1.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_grp_exec.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_skip.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_status.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_sp.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/suite/rpl/t/rpl_sp_effects.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/suite/rpl/t/rpl_stm_until.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
Replaced start slave by start_slave.inc.
Added explicit connection slave since wait_for_slave_sql_to_stop.inc
does not do that anymore.
mysql-test/t/disabled.def:
Disabled failing test.
mysql-test/t/func_time.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/grant.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/grant2.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/innodb_notembedded.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/log_bin_trust_function_creators_func.test:
Restore @@global.log_bin_trust_function_creators at end of test.
Clean up at end of test by dropping the created user.
mysql-test/t/query_cache.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/query_cache_notembedded.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/rpl_init_slave_func.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/t/timezone2.test:
Restore @@global.log_bin_trust_function_creators at end of test.
2008-07-10 18:09:39 +02:00
|
|
|
include/stop_slave.inc
|
2005-12-22 06:39:02 +01:00
|
|
|
reset master;
|
|
|
|
|
reset slave;
|
2008-09-01 11:27:41 +02:00
|
|
|
start slave;
|
2006-02-07 00:18:10 +01:00
|
|
|
create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
|
2005-12-22 06:39:02 +01:00
|
|
|
insert into t1 values (NULL);
|
|
|
|
|
drop table t1;
|
2006-02-07 00:18:10 +01:00
|
|
|
create table t1 (word char(20) not null)ENGINE=MyISAM;
|
2007-12-20 18:38:23 +01:00
|
|
|
load data infile 'LOAD_FILE' into table t1 ignore 1 lines;
|
2005-12-22 06:39:02 +01:00
|
|
|
select count(*) from t1;
|
|
|
|
|
count(*)
|
|
|
|
|
69
|
|
|
|
|
show binlog events;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
|
2006-02-07 00:18:10 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; COMMIT
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; drop table t1
|
2006-02-07 00:18:10 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; COMMIT
|
2007-03-30 10:27:08 +02:00
|
|
|
show binlog events from 106 limit 1;
|
2005-12-22 06:39:02 +01:00
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
2006-02-07 00:18:10 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
|
2007-03-30 10:27:08 +02:00
|
|
|
show binlog events from 106 limit 2;
|
2005-12-22 06:39:02 +01:00
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
2006-02-07 00:18:10 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query 1 # use `test`; BEGIN
|
2007-03-30 10:27:08 +02:00
|
|
|
show binlog events from 106 limit 2,1;
|
2005-12-22 06:39:02 +01:00
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
2005-12-22 06:39:02 +01:00
|
|
|
flush logs;
|
2006-03-03 09:49:46 +01:00
|
|
|
create table t3 (a int)ENGINE=MyISAM;
|
Bug#19259 rpl_ndb_dd_partitions failed on Solaris
Actually, this testcase will fail generally on all testing platforms.
The bugs come from the inconsistent bitmap between rpl master and slave.
In log_event.cc, the n_bits of m_cols and m_cols_ai are intialized with octal-ceiling
m_width, in fact, their n_bits should be equal to m_width.
Wrong n_bits will cause bitmap_bits_set() get incorrect value in unpack_row()
in rpl_record.cc,
then an assertion in unpack_row() will fail and crash sql thread.
DBUG_ASSERT(null_ptr == row_data + master_null_byte_count);
Meanwhile, because of binlog_prepare_pending_rows_event() changed with correct
m_cols, some results of specific testcases should be updated:
binlog_multi_engine.test
ndb_binlog_multi.test
rpl_ndb_dd_partitions.test
rpl_ndb_log.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2.test
In addition, to ensure rows replication correct between master and slave after the patch,
two 'select * from t1' are added in extra/rpl_tests/rpl_log.test, and some testcases include
rpl_log.test, therefore, the results of these testcases should be updated likewise:
rpl_stm_log.test
rpl_row_log.test
rpl_ndb_log.test
rpl_row_log_innodb.test
Totally, results of nine testcases are updated.
include/my_bitmap.h:
add declaration for create_last_word_mask(), since we need to use it in log_event.cc
mysql-test/extra/rpl_tests/rpl_log.test:
add 'select * from t1' both on master and slave to ensure the replication consistent after patched
mysql-test/r/binlog_multi_engine.result:
update result
the following is commented by Andrei,
The differences can be explained.
Look at
lines of THD::binlog_prepare_pending_rows_event
if (!pending)
...
!bitmap_cmp(pending->get_cols(), cols))
The row event disappears because after correcting master side Write_rows_log_event's m_col bitmap initialization,
this event has the same m_cols as the preceding one and thereafter they got glued into one bigger size event.
This is the correct behaviour now.
mysql-test/r/ndb_binlog_multi.result:
update result
same reason with binlog_multi_engine for Write_rows_log_event
mysql-test/r/rpl_ndb_dd_partitions.result:
update result,
reasons:
1. tablespace description format changed
2. hex(b1) from 1 to 0 because there is a update sentence in include/rpl_multi_engine3.inc
UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
mysql-test/r/rpl_ndb_log.result:
update result
Write_rows event disapper for same reason with binlog_multi_engine ;
In addition, because add new select in extra/rpl_testsrpl_log.test,
corresponding new results are accompanying.
mysql-test/r/rpl_row_log.result:
because add new select in extra/rpl_testsrpl_log.test,
corresponding new results are accompanying.
mysql-test/r/rpl_row_log_innodb.result:
because add new select in extra/rpl_testsrpl_log.test,
corresponding new results are accompanying.
mysql-test/r/rpl_stm_log.result:
because add new select in extra/rpl_testsrpl_log.test,
corresponding new results are accompanying.
mysql-test/r/rpl_truncate_7ndb.result:
update result
same reason with binlog_multi_engine for Write_rows_log_event
mysql-test/r/rpl_truncate_7ndb_2.result:
update result
same reason with binlog_multi_engine for Write_rows_log_event
And for the change
-master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001 4 Format_desc 1 106 Server ver: SERVER_VERSION, Binlog ver
It's okay as FormatDescription event matured for 4 bytes since the last time the results had been recorded.
mysql-test/t/disabled.def:
resume this test case
sql/log_event.cc:
initialize m_cols' n_bits with m_width instead of octal-round(m_width);
initialize m_cols_ai' n_bits with m_width instead of octal-round(m_width);
after memcpy(), call create_last_word_mask() to clear extra bits in bitmap to ensure safety
mysql-test/t/rpl_ndb_dd_partitions-master.opt:
add --new=true passed to mysqld
mysql-test/t/rpl_ndb_dd_partitions-slave.opt:
add --new=true passed to mysqld
2007-07-12 15:19:29 +08:00
|
|
|
select * from t1 order by 1 asc;
|
|
|
|
|
word
|
|
|
|
|
Aarhus
|
|
|
|
|
Aaron
|
|
|
|
|
Aaron
|
|
|
|
|
Ababa
|
|
|
|
|
Ababa
|
|
|
|
|
aback
|
|
|
|
|
aback
|
|
|
|
|
abaft
|
|
|
|
|
abaft
|
|
|
|
|
abandon
|
|
|
|
|
abandon
|
|
|
|
|
abandoned
|
|
|
|
|
abandoned
|
|
|
|
|
abandoning
|
|
|
|
|
abandoning
|
|
|
|
|
abandonment
|
|
|
|
|
abandonment
|
|
|
|
|
abandons
|
|
|
|
|
abandons
|
|
|
|
|
abase
|
|
|
|
|
abased
|
|
|
|
|
abasement
|
|
|
|
|
abasements
|
|
|
|
|
abases
|
|
|
|
|
abash
|
|
|
|
|
abashed
|
|
|
|
|
abashes
|
|
|
|
|
abashing
|
|
|
|
|
abasing
|
|
|
|
|
abate
|
|
|
|
|
abated
|
|
|
|
|
abatement
|
|
|
|
|
abatements
|
|
|
|
|
abater
|
|
|
|
|
abates
|
|
|
|
|
abating
|
|
|
|
|
Abba
|
|
|
|
|
abbe
|
|
|
|
|
abbey
|
|
|
|
|
abbeys
|
|
|
|
|
abbot
|
|
|
|
|
abbots
|
|
|
|
|
Abbott
|
|
|
|
|
abbreviate
|
|
|
|
|
abbreviated
|
|
|
|
|
abbreviates
|
|
|
|
|
abbreviating
|
|
|
|
|
abbreviation
|
|
|
|
|
abbreviations
|
|
|
|
|
Abby
|
|
|
|
|
abdomen
|
|
|
|
|
abdomens
|
|
|
|
|
abdominal
|
|
|
|
|
abduct
|
|
|
|
|
abducted
|
|
|
|
|
abduction
|
|
|
|
|
abductions
|
|
|
|
|
abductor
|
|
|
|
|
abductors
|
|
|
|
|
abducts
|
|
|
|
|
Abe
|
|
|
|
|
abed
|
|
|
|
|
Abel
|
|
|
|
|
Abelian
|
|
|
|
|
Abelson
|
|
|
|
|
Aberdeen
|
|
|
|
|
Abernathy
|
|
|
|
|
aberrant
|
|
|
|
|
aberration
|
|
|
|
|
select * from t1 order by 1 asc;
|
|
|
|
|
word
|
|
|
|
|
Aarhus
|
|
|
|
|
Aaron
|
|
|
|
|
Aaron
|
|
|
|
|
Ababa
|
|
|
|
|
Ababa
|
|
|
|
|
aback
|
|
|
|
|
aback
|
|
|
|
|
abaft
|
|
|
|
|
abaft
|
|
|
|
|
abandon
|
|
|
|
|
abandon
|
|
|
|
|
abandoned
|
|
|
|
|
abandoned
|
|
|
|
|
abandoning
|
|
|
|
|
abandoning
|
|
|
|
|
abandonment
|
|
|
|
|
abandonment
|
|
|
|
|
abandons
|
|
|
|
|
abandons
|
|
|
|
|
abase
|
|
|
|
|
abased
|
|
|
|
|
abasement
|
|
|
|
|
abasements
|
|
|
|
|
abases
|
|
|
|
|
abash
|
|
|
|
|
abashed
|
|
|
|
|
abashes
|
|
|
|
|
abashing
|
|
|
|
|
abasing
|
|
|
|
|
abate
|
|
|
|
|
abated
|
|
|
|
|
abatement
|
|
|
|
|
abatements
|
|
|
|
|
abater
|
|
|
|
|
abates
|
|
|
|
|
abating
|
|
|
|
|
Abba
|
|
|
|
|
abbe
|
|
|
|
|
abbey
|
|
|
|
|
abbeys
|
|
|
|
|
abbot
|
|
|
|
|
abbots
|
|
|
|
|
Abbott
|
|
|
|
|
abbreviate
|
|
|
|
|
abbreviated
|
|
|
|
|
abbreviates
|
|
|
|
|
abbreviating
|
|
|
|
|
abbreviation
|
|
|
|
|
abbreviations
|
|
|
|
|
Abby
|
|
|
|
|
abdomen
|
|
|
|
|
abdomens
|
|
|
|
|
abdominal
|
|
|
|
|
abduct
|
|
|
|
|
abducted
|
|
|
|
|
abduction
|
|
|
|
|
abductions
|
|
|
|
|
abductor
|
|
|
|
|
abductors
|
|
|
|
|
abducts
|
|
|
|
|
Abe
|
|
|
|
|
abed
|
|
|
|
|
Abel
|
|
|
|
|
Abelian
|
|
|
|
|
Abelson
|
|
|
|
|
Aberdeen
|
|
|
|
|
Abernathy
|
|
|
|
|
aberrant
|
|
|
|
|
aberration
|
2005-12-22 06:39:02 +01:00
|
|
|
flush logs;
|
BUG#37975: wait_for_slave_* should increase the timeout
Problem 1: tests often fail in pushbuild with a timeout when waiting
for the slave to start/stop/receive error.
Fix 1: Updated the wait_for_slave_* macros in the following way:
- The timeout is increased by a factor ten
- Refactored the macros so that wait_for_slave_param does the work for
the other macros.
Problem 2: Tests are often incorrectly written, lacking a
source include/wait_for_slave_to_[start|stop].inc.
Fix 2: Improved the chance to get it right by adding
include/start_slave.inc and include/stop_slave.inc, and updated tests
to use these.
Problem 3: The the built-in test language command
wait_for_slave_to_stop is a misnomer (does not wait for the slave io
thread) and does not give as much debug info in case of failure as
the otherwise equivalent macro
source include/wait_for_slave_sql_to_stop.inc
Fix 3: Replaced all calls to the built-in command by a call to the
macro.
Problem 4: Some, but not all, of the wait_for_slave_* macros had an
implicit connection slave. This made some tests confusing to read,
and made it more difficult to use the macro in circular replication
scenarios, where the connection named master needs to wait.
Fix 4: Removed the implicit connection slave from all
wait_for_slave_* macros, and updated tests to use an explicit
connection slave where necessary.
Problem 5: The macros wait_slave_status.inc and wait_show_pattern.inc
were unused. Moreover, using them is difficult and error-prone.
Fix 5: remove these macros.
Problem 6: log_bin_trust_function_creators_basic failed when running
tests because it assumed @@global.log_bin_trust_function_creators=1,
and some tests modified this variable without resetting it to its
original value.
Fix 6: All tests that use this variable have been updated so that
they reset the value at end of test.
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc
Added connection slave since includ/wait_for_slave_sql_to_stop.inc
does not do that anymore.
mysql-test/extra/rpl_tests/rpl_log.test:
Replaced start slave+wait_slave_status by start_slave.inc
mysql-test/include/reset_master_and_slave.inc:
replaced start/stop slave by start_slave.inc/stop_slave.inc
mysql-test/include/sync_slave_io_with_master.inc:
Improved comments and error message.
mysql-test/include/wait_for_slave_io_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_param.inc:
- Improved usage instructions
- Added more debug info in case of timeout
- Added parameters $slave_param_comparison, $slave_timeout,
$slave_keep_connection, $slave_error_message
mysql-test/include/wait_for_slave_sql_error.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_sql_to_start.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_sql_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_to_start.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_for_slave_to_stop.inc:
Refactored to use wait_for_slave_param.inc.
Removed connection slave.
mysql-test/include/wait_show_pattern.inc:
Removed unused (and error-prone) file
mysql-test/include/wait_slave_status.inc:
Removed unused (and error-prone) file
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
Renamed $keep_connection to $slave_keep_connection.
mysql-test/suite/rpl/t/rpl_bug26395.test:
Replace stop slave by stop_slave.inc
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
Replace start/stop slave by start_slave.inc/stop_slave.inc.
Replace wait_for_slave_param by wait_for_slave_sql_to_stop.inc.
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Renamed $keep_connection to $slave_keep_connection.
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
Replace wait_slave_status by start_slave.inc
mysql-test/suite/rpl/t/rpl_idempotency.test:
Added connection slave since wait_for_slave_sql_to_stop.inc does not
do that any more.
mysql-test/suite/rpl/t/rpl_incident.test:
Replaced wait_for_slave_to_stop by wait_for_slave_sql_to_stop.inc
mysql-test/suite/rpl/t/rpl_init_slave.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl/t/rpl_log_pos.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced wait_for_slave_param by other wait_for_slave_* macros.
mysql-test/suite/rpl/t/rpl_packet.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_row_until.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl/t/rpl_server_id1.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_grp_exec.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_skip.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_slave_status.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/suite/rpl/t/rpl_sp.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/suite/rpl/t/rpl_sp_effects.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/suite/rpl/t/rpl_stm_until.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
Replaced save_master_pos;connection slave;sync_with_master by
sync_slave_with_master.
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test:
Replaced start slave by start_slave.inc.
Added explicit connection slave since wait_for_slave_sql_to_stop.inc
does not do that anymore.
mysql-test/t/disabled.def:
Disabled failing test.
mysql-test/t/func_time.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/grant.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/grant2.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/innodb_notembedded.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/log_bin_trust_function_creators_func.test:
Restore @@global.log_bin_trust_function_creators at end of test.
Clean up at end of test by dropping the created user.
mysql-test/t/query_cache.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/query_cache_notembedded.test:
Restore @@global.log_bin_trust_function_creators at end of test.
mysql-test/t/rpl_init_slave_func.test:
Replaced start/stop slave by start_slave.inc/stop_slave.inc.
mysql-test/t/timezone2.test:
Restore @@global.log_bin_trust_function_creators at end of test.
2008-07-10 18:09:39 +02:00
|
|
|
include/stop_slave.inc
|
|
|
|
|
include/start_slave.inc
|
2006-03-03 09:49:46 +01:00
|
|
|
create table t2 (n int)ENGINE=MyISAM;
|
|
|
|
|
insert into t2 values (1);
|
2007-03-30 10:27:08 +02:00
|
|
|
show binlog events from <binlog_start>;
|
2005-12-22 06:39:02 +01:00
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
2007-03-30 10:27:08 +02:00
|
|
|
master-bin.000001 # Query # # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query # # use `test`; BEGIN
|
2007-03-30 10:27:08 +02:00
|
|
|
master-bin.000001 # Table_map # # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query # # use `test`; COMMIT
|
2007-03-30 10:27:08 +02:00
|
|
|
master-bin.000001 # Query # # use `test`; drop table t1
|
|
|
|
|
master-bin.000001 # Query # # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query # # use `test`; BEGIN
|
2007-03-30 10:27:08 +02:00
|
|
|
master-bin.000001 # Table_map # # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query # # use `test`; COMMIT
|
2007-03-30 10:27:08 +02:00
|
|
|
master-bin.000001 # Rotate # # master-bin.000002;pos=4
|
2005-12-22 06:39:02 +01:00
|
|
|
show binlog events in 'master-bin.000002';
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
|
2006-03-03 09:49:46 +01:00
|
|
|
master-bin.000002 # Query 1 # use `test`; create table t3 (a int)ENGINE=MyISAM
|
|
|
|
|
master-bin.000002 # Query 1 # use `test`; create table t2 (n int)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000002 # Query 1 # use `test`; BEGIN
|
2006-03-03 09:49:46 +01:00
|
|
|
master-bin.000002 # Table_map 1 # table_id: # (test.t2)
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000002 # Query 1 # use `test`; COMMIT
|
2005-12-22 06:39:02 +01:00
|
|
|
show binary logs;
|
|
|
|
|
Log_name File_size
|
2009-02-02 14:44:18 +03:00
|
|
|
master-bin.000001 #
|
|
|
|
|
master-bin.000002 #
|
2005-12-22 06:39:02 +01:00
|
|
|
show binary logs;
|
|
|
|
|
Log_name File_size
|
2009-02-02 14:44:18 +03:00
|
|
|
slave-bin.000001 #
|
|
|
|
|
slave-bin.000002 #
|
2005-12-22 06:39:02 +01:00
|
|
|
show binlog events in 'slave-bin.000001' from 4;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
|
2006-02-07 00:18:10 +01:00
|
|
|
slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
slave-bin.000001 # Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
slave-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
slave-bin.000001 # Query 1 # use `test`; COMMIT
|
2005-12-22 06:39:02 +01:00
|
|
|
slave-bin.000001 # Query 1 # use `test`; drop table t1
|
2006-02-07 00:18:10 +01:00
|
|
|
slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
slave-bin.000001 # Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
slave-bin.000001 # Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
slave-bin.000001 # Query 1 # use `test`; COMMIT
|
2006-03-03 09:49:46 +01:00
|
|
|
slave-bin.000001 # Query 1 # use `test`; create table t3 (a int)ENGINE=MyISAM
|
2005-12-22 06:39:02 +01:00
|
|
|
slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
|
|
|
|
|
show binlog events in 'slave-bin.000002' from 4;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
|
2006-03-03 09:49:46 +01:00
|
|
|
slave-bin.000002 # Query 1 # use `test`; create table t2 (n int)ENGINE=MyISAM
|
2008-03-28 13:16:41 +01:00
|
|
|
slave-bin.000002 # Query 1 # use `test`; BEGIN
|
2006-03-03 09:49:46 +01:00
|
|
|
slave-bin.000002 # Table_map 1 # table_id: # (test.t2)
|
2006-02-24 16:19:55 +01:00
|
|
|
slave-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
slave-bin.000002 # Query 1 # use `test`; COMMIT
|
2007-06-11 22:15:39 +02:00
|
|
|
SHOW SLAVE STATUS;
|
|
|
|
|
Slave_IO_State #
|
|
|
|
|
Master_Host 127.0.0.1
|
|
|
|
|
Master_User root
|
|
|
|
|
Master_Port MASTER_PORT
|
|
|
|
|
Connect_Retry 1
|
|
|
|
|
Master_Log_File master-bin.000002
|
2008-03-28 13:16:41 +01:00
|
|
|
Read_Master_Log_Pos 516
|
2007-06-11 22:15:39 +02:00
|
|
|
Relay_Log_File #
|
|
|
|
|
Relay_Log_Pos #
|
|
|
|
|
Relay_Master_Log_File master-bin.000002
|
|
|
|
|
Slave_IO_Running Yes
|
|
|
|
|
Slave_SQL_Running Yes
|
|
|
|
|
Replicate_Do_DB
|
|
|
|
|
Replicate_Ignore_DB
|
|
|
|
|
Replicate_Do_Table
|
|
|
|
|
Replicate_Ignore_Table #
|
|
|
|
|
Replicate_Wild_Do_Table
|
|
|
|
|
Replicate_Wild_Ignore_Table
|
|
|
|
|
Last_Errno 0
|
|
|
|
|
Last_Error
|
|
|
|
|
Skip_Counter 0
|
2008-03-28 13:16:41 +01:00
|
|
|
Exec_Master_Log_Pos 516
|
2007-06-11 22:15:39 +02:00
|
|
|
Relay_Log_Space #
|
|
|
|
|
Until_Condition None
|
|
|
|
|
Until_Log_File
|
|
|
|
|
Until_Log_Pos 0
|
|
|
|
|
Master_SSL_Allowed No
|
|
|
|
|
Master_SSL_CA_File
|
|
|
|
|
Master_SSL_CA_Path
|
|
|
|
|
Master_SSL_Cert
|
|
|
|
|
Master_SSL_Cipher
|
|
|
|
|
Master_SSL_Key
|
|
|
|
|
Seconds_Behind_Master #
|
|
|
|
|
Master_SSL_Verify_Server_Cert No
|
|
|
|
|
Last_IO_Errno #
|
|
|
|
|
Last_IO_Error #
|
|
|
|
|
Last_SQL_Errno 0
|
|
|
|
|
Last_SQL_Error
|
2005-12-22 06:39:02 +01:00
|
|
|
show binlog events in 'slave-bin.000005' from 4;
|
|
|
|
|
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
|
2006-03-03 09:49:46 +01:00
|
|
|
DROP TABLE t1;
|
|
|
|
|
DROP TABLE t2;
|
|
|
|
|
DROP TABLE t3;
|
2008-10-29 18:38:18 +01:00
|
|
|
stop slave;
|
|
|
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
|
|
|
reset master;
|
|
|
|
|
reset slave;
|
|
|
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
|
|
|
start slave;
|
2006-06-19 20:21:00 +04:00
|
|
|
create table t1(a int auto_increment primary key, b int);
|
|
|
|
|
insert into t1 values (NULL, 1);
|
|
|
|
|
set insert_id=5;
|
|
|
|
|
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
|
2007-03-30 10:27:08 +02:00
|
|
|
show binlog events from <binlog_start>;
|
2006-06-19 20:21:00 +04:00
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
2008-10-29 18:38:18 +01:00
|
|
|
master-bin.000001 # Query # # use `test`; create table t1(a int auto_increment primary key, b int)
|
|
|
|
|
master-bin.000001 # Query # # use `test`; BEGIN
|
|
|
|
|
master-bin.000001 # Table_map # # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 # Query # # use `test`; COMMIT
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query # # use `test`; BEGIN
|
2007-03-30 10:27:08 +02:00
|
|
|
master-bin.000001 # Table_map # # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
|
2008-03-28 13:16:41 +01:00
|
|
|
master-bin.000001 # Query # # use `test`; COMMIT
|
2006-06-19 20:21:00 +04:00
|
|
|
select * from t1;
|
|
|
|
|
a b
|
|
|
|
|
1 1
|
|
|
|
|
5 1
|
|
|
|
|
6 1
|
|
|
|
|
drop table t1;
|