2003-09-14 00:13:41 +04: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;
|
2009-02-19 23:29:12 +03:00
|
|
|
CREATE TABLE t1(n INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
|
|
|
|
|
INSERT INTO t1 VALUES (1),(2),(3),(4);
|
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
CREATE TABLE t2(n INT NOT NULL AUTO_INCREMENT PRIMARY KEY);
|
|
|
|
|
INSERT INTO t2 VALUES (1),(2);
|
|
|
|
|
INSERT INTO t2 VALUES (3),(4);
|
|
|
|
|
DROP TABLE t2;
|
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
|
2009-02-19 23:29:12 +03:00
|
|
|
RESET SLAVE;
|
|
|
|
|
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_drop_t1
|
|
|
|
|
SELECT * FROM t1;
|
2003-09-14 00:13:41 +04:00
|
|
|
n
|
|
|
|
|
1
|
|
|
|
|
2
|
|
|
|
|
3
|
|
|
|
|
4
|
2007-06-11 22:15:39 +02:00
|
|
|
SHOW SLAVE STATUS;
|
2007-05-30 17:00:48 +02:00
|
|
|
Slave_IO_State #
|
|
|
|
|
Master_Host 127.0.0.1
|
|
|
|
|
Master_User root
|
2009-02-19 23:29:12 +03:00
|
|
|
Master_Port #
|
2007-05-30 17:00:48 +02:00
|
|
|
Connect_Retry 1
|
|
|
|
|
Master_Log_File master-bin.000001
|
2009-02-19 23:29:12 +03:00
|
|
|
Read_Master_Log_Pos #
|
2007-06-11 22:15:39 +02:00
|
|
|
Relay_Log_File #
|
2007-05-30 17:00:48 +02:00
|
|
|
Relay_Log_Pos #
|
|
|
|
|
Relay_Master_Log_File master-bin.000001
|
2007-06-11 22:15:39 +02:00
|
|
|
Slave_IO_Running Yes
|
2007-05-30 17:00:48 +02:00
|
|
|
Slave_SQL_Running No
|
|
|
|
|
Replicate_Do_DB
|
|
|
|
|
Replicate_Ignore_DB
|
|
|
|
|
Replicate_Do_Table
|
2007-06-11 22:15:39 +02:00
|
|
|
Replicate_Ignore_Table #
|
2007-05-30 17:00:48 +02:00
|
|
|
Replicate_Wild_Do_Table
|
|
|
|
|
Replicate_Wild_Ignore_Table
|
|
|
|
|
Last_Errno 0
|
|
|
|
|
Last_Error
|
|
|
|
|
Skip_Counter 0
|
2009-02-19 23:29:12 +03:00
|
|
|
Exec_Master_Log_Pos MASTER_POS_DROP_T1
|
2007-05-30 17:00:48 +02:00
|
|
|
Relay_Log_Space #
|
|
|
|
|
Until_Condition Master
|
|
|
|
|
Until_Log_File master-bin.000001
|
2009-02-19 23:29:12 +03:00
|
|
|
Until_Log_Pos MASTER_POS_DROP_T1
|
2007-05-30 17:00:48 +02:00
|
|
|
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
|
2007-06-11 22:15:39 +02:00
|
|
|
Last_IO_Errno #
|
|
|
|
|
Last_IO_Error #
|
|
|
|
|
Last_SQL_Errno 0
|
|
|
|
|
Last_SQL_Error
|
2009-10-01 19:44:53 +03:00
|
|
|
Replicate_Ignore_Server_Ids
|
|
|
|
|
Master_Server_Id 1
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001', MASTER_LOG_POS=291;
|
|
|
|
|
SELECT * FROM t1;
|
2003-09-14 00:13:41 +04:00
|
|
|
n
|
|
|
|
|
1
|
|
|
|
|
2
|
|
|
|
|
3
|
|
|
|
|
4
|
2007-06-11 22:15:39 +02:00
|
|
|
SHOW SLAVE STATUS;
|
2007-05-30 17:00:48 +02:00
|
|
|
Slave_IO_State #
|
|
|
|
|
Master_Host 127.0.0.1
|
|
|
|
|
Master_User root
|
2009-02-19 23:29:12 +03:00
|
|
|
Master_Port #
|
2007-05-30 17:00:48 +02:00
|
|
|
Connect_Retry 1
|
|
|
|
|
Master_Log_File master-bin.000001
|
2009-02-19 23:29:12 +03:00
|
|
|
Read_Master_Log_Pos #
|
2007-06-11 22:15:39 +02:00
|
|
|
Relay_Log_File #
|
2007-05-30 17:00:48 +02:00
|
|
|
Relay_Log_Pos #
|
|
|
|
|
Relay_Master_Log_File master-bin.000001
|
2007-06-11 22:15:39 +02:00
|
|
|
Slave_IO_Running Yes
|
2007-05-30 17:00:48 +02:00
|
|
|
Slave_SQL_Running No
|
|
|
|
|
Replicate_Do_DB
|
|
|
|
|
Replicate_Ignore_DB
|
|
|
|
|
Replicate_Do_Table
|
2007-06-11 22:15:39 +02:00
|
|
|
Replicate_Ignore_Table #
|
2007-05-30 17:00:48 +02:00
|
|
|
Replicate_Wild_Do_Table
|
|
|
|
|
Replicate_Wild_Ignore_Table
|
|
|
|
|
Last_Errno 0
|
|
|
|
|
Last_Error
|
|
|
|
|
Skip_Counter 0
|
2009-02-19 23:29:12 +03:00
|
|
|
Exec_Master_Log_Pos MASTER_POS_DROP_T1
|
2007-05-30 17:00:48 +02:00
|
|
|
Relay_Log_Space #
|
|
|
|
|
Until_Condition Master
|
|
|
|
|
Until_Log_File master-no-such-bin.000001
|
|
|
|
|
Until_Log_Pos 291
|
|
|
|
|
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
|
2007-06-11 22:15:39 +02:00
|
|
|
Last_IO_Errno #
|
|
|
|
|
Last_IO_Error #
|
|
|
|
|
Last_SQL_Errno 0
|
|
|
|
|
Last_SQL_Error
|
2009-10-01 19:44:53 +03:00
|
|
|
Replicate_Ignore_Server_Ids
|
|
|
|
|
Master_Server_Id 1
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', RELAY_LOG_POS=relay_pos_insert1_t2
|
|
|
|
|
SELECT * FROM t2;
|
2003-09-14 00:13:41 +04:00
|
|
|
n
|
|
|
|
|
1
|
|
|
|
|
2
|
2007-06-11 22:15:39 +02:00
|
|
|
SHOW SLAVE STATUS;
|
2007-05-30 17:00:48 +02:00
|
|
|
Slave_IO_State #
|
|
|
|
|
Master_Host 127.0.0.1
|
|
|
|
|
Master_User root
|
2009-02-19 23:29:12 +03:00
|
|
|
Master_Port #
|
2007-05-30 17:00:48 +02:00
|
|
|
Connect_Retry 1
|
|
|
|
|
Master_Log_File master-bin.000001
|
2009-02-19 23:29:12 +03:00
|
|
|
Read_Master_Log_Pos #
|
2007-06-11 22:15:39 +02:00
|
|
|
Relay_Log_File #
|
2007-05-30 17:00:48 +02:00
|
|
|
Relay_Log_Pos #
|
|
|
|
|
Relay_Master_Log_File master-bin.000001
|
2007-06-11 22:15:39 +02:00
|
|
|
Slave_IO_Running Yes
|
2007-05-30 17:00:48 +02:00
|
|
|
Slave_SQL_Running No
|
|
|
|
|
Replicate_Do_DB
|
|
|
|
|
Replicate_Ignore_DB
|
|
|
|
|
Replicate_Do_Table
|
2007-06-11 22:15:39 +02:00
|
|
|
Replicate_Ignore_Table #
|
2007-05-30 17:00:48 +02:00
|
|
|
Replicate_Wild_Do_Table
|
|
|
|
|
Replicate_Wild_Ignore_Table
|
|
|
|
|
Last_Errno 0
|
|
|
|
|
Last_Error
|
|
|
|
|
Skip_Counter 0
|
2009-02-19 23:29:12 +03:00
|
|
|
Exec_Master_Log_Pos MASTER_POS_INSERT1_T2
|
2007-05-30 17:00:48 +02:00
|
|
|
Relay_Log_Space #
|
|
|
|
|
Until_Condition Relay
|
2009-02-19 23:29:12 +03:00
|
|
|
Until_Log_File slave-relay-bin.000002
|
|
|
|
|
Until_Log_Pos RELAY_POS_INSERT1_T2
|
2007-05-30 17:00:48 +02:00
|
|
|
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
|
2007-06-11 22:15:39 +02:00
|
|
|
Last_IO_Errno #
|
|
|
|
|
Last_IO_Error #
|
|
|
|
|
Last_SQL_Errno 0
|
|
|
|
|
Last_SQL_Error
|
2009-10-01 19:44:53 +03:00
|
|
|
Replicate_Ignore_Server_Ids
|
|
|
|
|
Master_Server_Id 1
|
2009-02-19 23:29:12 +03:00
|
|
|
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
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE SQL_THREAD UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_create_t2
|
2007-06-11 22:15:39 +02:00
|
|
|
SHOW SLAVE STATUS;
|
2007-05-30 17:00:48 +02:00
|
|
|
Slave_IO_State #
|
|
|
|
|
Master_Host 127.0.0.1
|
|
|
|
|
Master_User root
|
2009-02-19 23:29:12 +03:00
|
|
|
Master_Port #
|
2007-05-30 17:00:48 +02:00
|
|
|
Connect_Retry 1
|
|
|
|
|
Master_Log_File master-bin.000001
|
2009-02-19 23:29:12 +03:00
|
|
|
Read_Master_Log_Pos #
|
2007-06-11 22:15:39 +02:00
|
|
|
Relay_Log_File #
|
2007-05-30 17:00:48 +02:00
|
|
|
Relay_Log_Pos #
|
|
|
|
|
Relay_Master_Log_File master-bin.000001
|
2008-04-02 22:50:54 +04:00
|
|
|
Slave_IO_Running No
|
2007-05-30 17:00:48 +02:00
|
|
|
Slave_SQL_Running No
|
|
|
|
|
Replicate_Do_DB
|
|
|
|
|
Replicate_Ignore_DB
|
|
|
|
|
Replicate_Do_Table
|
2007-06-11 22:15:39 +02:00
|
|
|
Replicate_Ignore_Table #
|
2007-05-30 17:00:48 +02:00
|
|
|
Replicate_Wild_Do_Table
|
|
|
|
|
Replicate_Wild_Ignore_Table
|
|
|
|
|
Last_Errno 0
|
|
|
|
|
Last_Error
|
|
|
|
|
Skip_Counter 0
|
2009-02-19 23:29:12 +03:00
|
|
|
Exec_Master_Log_Pos MASTER_POS_DROP_T2
|
2007-05-30 17:00:48 +02:00
|
|
|
Relay_Log_Space #
|
|
|
|
|
Until_Condition Master
|
|
|
|
|
Until_Log_File master-bin.000001
|
2009-02-19 23:29:12 +03:00
|
|
|
Until_Log_Pos MASTER_POS_CREATE_T2
|
2007-05-30 17:00:48 +02:00
|
|
|
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
|
2007-06-11 22:15:39 +02:00
|
|
|
Last_IO_Errno #
|
|
|
|
|
Last_IO_Error #
|
|
|
|
|
Last_SQL_Errno 0
|
|
|
|
|
Last_SQL_Error
|
2009-10-01 19:44:53 +03:00
|
|
|
Replicate_Ignore_Server_Ids
|
|
|
|
|
Master_Server_Id 1
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE UNTIL MASTER_LOG_FILE='master-bin', MASTER_LOG_POS=561;
|
2004-06-15 15:38:36 -05:00
|
|
|
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=561, RELAY_LOG_POS=12;
|
2004-06-15 15:38:36 -05:00
|
|
|
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001';
|
2004-06-15 15:38:36 -05:00
|
|
|
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000009';
|
2004-06-15 15:38:36 -05:00
|
|
|
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', MASTER_LOG_POS=561;
|
2004-06-15 15:38:36 -05:00
|
|
|
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
|
2009-02-19 23:29:12 +03:00
|
|
|
START SLAVE;
|
|
|
|
|
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=740;
|
2003-09-14 00:13:41 +04:00
|
|
|
Warnings:
|
After merge fixes
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
BitKeeper/deleted/.del-ctype_tis620.result-old~3578ceb0b8284685:
Delete: mysql-test/r/ctype_tis620.result-old
BitKeeper/deleted/.del-ctype_tis620.test-old~ffb1bbd2935d1aba:
Delete: mysql-test/t/ctype_tis620.test-old
client/mysqlbinlog.cc:
Added DBUG statements
Added call of my_end() to free all used memory on exit
heap/hp_info.c:
After merge fixes
heap/hp_open.c:
After merge fixes
include/heap.h:
After merge fixes
include/m_ctype.h:
Use pchar instead of 'int' for character parameters.
Added 'my_binary_compare()'
include/m_string.h:
Fixed wrong define
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
mysql-test/r/alter_table.result:
Fixed results after merge
mysql-test/r/auto_increment.result:
Fixed results after merge
mysql-test/r/bdb.result:
Fixed results after merge
mysql-test/r/binary.result:
Fixed results after merge
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/ctype_mb.result:
Fixed results after merge
mysql-test/r/ctype_tis620.result:
Fixed results after merge
mysql-test/r/ctype_utf8.result:
Fixed results after merge
mysql-test/r/delete.result:
Fixed results after merge
mysql-test/r/func_compress.result:
Fixed results after merge
mysql-test/r/func_gconcat.result:
Fixed results after merge
mysql-test/r/func_group.result:
Fixed results after merge
mysql-test/r/func_str.result:
Fixed results after merge
mysql-test/r/innodb.result:
Fixed results after merge
mysql-test/r/insert.result:
Fixed results after merge
mysql-test/r/insert_select.result:
Fixed results after merge
mysql-test/r/key.result:
Fixed results after merge
mysql-test/r/loaddata.result:
Fixed results after merge
mysql-test/r/lock.result:
Fixed results after merge
mysql-test/r/myisam.result:
Fixed results after merge
mysql-test/r/null.result:
Fixed results after merge
mysql-test/r/null_key.result:
Fixed results after merge
mysql-test/r/order_by.result:
Fixed results after merge
mysql-test/r/query_cache.result:
Fixed results after merge
mysql-test/r/range.result:
Fixed results after merge
mysql-test/r/rpl_multi_delete.result:
Fixed results after merge
mysql-test/r/rpl_until.result:
Fixed results after merge
mysql-test/r/subselect.result:
Fixed results after merge
mysql-test/r/subselect_innodb.result:
Fixed results after merge
mysql-test/r/type_blob.result:
Fixed results after merge
mysql-test/r/type_datetime.result:
Fixed results after merge
mysql-test/r/type_decimal.result:
Fixed results after merge
mysql-test/r/type_enum.result:
Fixed results after merge
mysql-test/r/type_float.result:
Fixed results after merge
mysql-test/r/type_ranges.result:
Fixed results after merge
mysql-test/r/type_time.result:
Fixed results after merge
mysql-test/r/type_timestamp.result:
Fixed results after merge
mysql-test/r/type_uint.result:
Fixed results after merge
mysql-test/r/type_year.result:
Fixed results after merge
mysql-test/r/variables.result:
Fixed results after merge
mysql-test/r/warnings.result:
Fixed results after merge
mysql-test/t/case.test:
Fixed shifted error messages
mysql-test/t/create.test:
Fixed shifted error messages
mysql-test/t/ctype_collate.test:
Fixed shifted error messages
mysql-test/t/ctype_tis620.test:
Merge with 4.0 ctype_tis620 test
mysql-test/t/delete.test:
Fixed shifted error messages
mysql-test/t/derived.test:
Fixed shifted error messages
mysql-test/t/fulltext.test:
Fixed shifted error messages
mysql-test/t/func_in.test:
Fixed shifted error messages
mysql-test/t/func_str.test:
Fixed shifted error messages
mysql-test/t/func_test.test:
Fixed shifted error messages
mysql-test/t/grant.test:
Fixed shifted error messages
mysql-test/t/innodb.test:
Change to 4.1 syntax
mysql-test/t/key_cache.test:
Fixed shifted error messages
mysql-test/t/myisam.test:
New test of blob and end space
mysql-test/t/row.test:
Fixed shifted error messages
mysql-test/t/rpl_until.test:
Fixed shifted error messages
mysql-test/t/subselect.test:
Fixed shifted error messages
mysql-test/t/subselect_innodb.test:
Fix test to take into account foreign key constraints
mysql-test/t/union.test:
Fixed shifted error messages
mysql-test/t/user_var.test:
Fixed shifted error messages
mysql-test/t/variables.test:
Fixed shifted error messages
mysys/my_handler.c:
Merge with 4.0 code
sql/ha_heap.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
After merge fixes
sql/item_cmpfunc.cc:
Ensure that we are comparing end space with BINARY strings
sql/item_cmpfunc.h:
Ensure that we are comparing end space with BINARY strings
sql/log_event.cc:
More DBUG statements
Ensure that we use all options to LOAD DATA in replication
sql/opt_range.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
Use 'any_db' instead of '' to mean 'no database comparison'
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Added function comment for setup_group()
sql/sql_string.cc:
Added stringcmp() for binary comparison.
Added function comments for sortcmp() and stringcmp()
sql/sql_string.h:
Added stringcmp()
sql/sql_table.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
sql/sql_yacc.yy:
Use 'any_db' instead of '' to mean any database. Using "" causes a 'wrong db name' error.
strings/ctype-big5.c:
Strip only end space, not other space characters.
strings/ctype-bin.c:
Removed some not needed functions.
Added function comments
Don't remove end space in comparisons
Change my_wildcmp_bin() to be 'identical' with other similar code
strings/ctype-czech.c:
Strip only end space, not other space characters.
strings/ctype-gbk.c:
Strip only end space, not other space characters.
strings/ctype-latin1.c:
Strip only end space, not other space characters.
strings/ctype-mb.c:
Strip only end space, not other space characters.
strings/ctype-simple.c:
Strip only end space, not other space characters.
strings/ctype-sjis.c:
Strip only end space, not other space characters.
strings/ctype-tis620.c:
Added usage of my_instr_simple. This needs to be cleaned up!
strings/ctype-utf8.c:
Strip only end space, not other space characters.
strings/ctype-win1250ch.c:
Strip only end space, not other space characters.
Fixed indentation
strings/strto.c:
Code cleanup
2004-02-16 10:03:25 +02:00
|
|
|
Note 1254 Slave is already running
|