Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1850 05/05/12 16:36:59 tomas@stripped +21 -0
patched results
mysql-test/t/rpl_row_trans.test
1.5 05/05/12 16:36:53 tomas@stripped +2 -2
patched results
mysql-test/t/rpl_row_ps.test
1.2 05/05/12 16:36:53 tomas@stripped +2 -2
patched results
mysql-test/t/rpl_row_charset.test
1.2 05/05/12 16:36:53 tomas@stripped +2 -2
patched results
mysql-test/t/rpl_log_pos.test
1.37 05/05/12 16:36:53 tomas@stripped +2 -0
patched results
mysql-test/t/rpl_insert_id.test
1.9 05/05/12 16:36:53 tomas@stripped +3 -2
patched results
mysql-test/t/rpl_flush_log_loop.test
1.11 05/05/12 16:36:53 tomas@stripped +1 -1
patched results
mysql-test/t/rpl000012.test
1.19 05/05/12 16:36:53 tomas@stripped +2 -3
patched results
mysql-test/t/rpl000001_row.test
1.2 05/05/12 16:36:53 tomas@stripped +2 -2
patched results
mysql-test/t/rpl000001.test
1.41 05/05/12 16:36:53 tomas@stripped +2 -2
patched results
mysql-test/r/rpl_until.result
1.28 05/05/12 16:36:53 tomas@stripped +4 -4
patched results
mysql-test/r/rpl_server_id1.result
1.13 05/05/12 16:36:53 tomas@stripped +1 -1
patched results
mysql-test/r/rpl_reset_slave.result
1.19 05/05/12 16:36:53 tomas@stripped +4 -4
patched results
mysql-test/r/rpl_replicate_do.result
1.36 05/05/12 16:36:53 tomas@stripped +1 -1
patched results
mysql-test/r/rpl_relayrotate.result
1.24 05/05/12 16:36:53 tomas@stripped +1 -1
patched results
mysql-test/r/rpl_max_relay_size.result
1.27 05/05/12 16:36:53 tomas@stripped +7 -7
patched results
mysql-test/r/rpl_log_pos.result
1.48 05/05/12 16:36:53 tomas@stripped +2 -2
patched results
mysql-test/r/rpl_flush_log_loop.result
1.30 05/05/12 16:36:53 tomas@stripped +1 -1
patched results
mysql-test/r/rpl_error_ignored_table.result
1.27 05/05/12 16:36:53 tomas@stripped +1 -1
patched results
mysql-test/r/rpl_deadlock.result
1.10 05/05/12 16:36:53 tomas@stripped +5 -5
patched results
mysql-test/r/rpl_change_master.result
1.24 05/05/12 16:36:52 tomas@stripped +2 -2
patched results
mysql-test/mysql-test-run.sh
1.272 05/05/12 16:36:52 tomas@stripped +3 -1
added host environmnent variables
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/wl2325-test
--- 1.271/mysql-test/mysql-test-run.sh 2005-05-12 11:43:13 +02:00
+++ 1.272/mysql-test/mysql-test-run.sh 2005-05-12 16:36:52 +02:00
@@ -207,8 +207,10 @@
MASTER_RUNNING=0
MASTER1_RUNNING=0
+MASTER_MYHOST=127.0.0.1
MASTER_MYPORT=9306
SLAVE_RUNNING=0
+SLAVE_MYHOST=127.0.0.1
SLAVE_MYPORT=9308 # leave room for 2 masters for cluster tests
MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves
NDBCLUSTER_PORT=9350
@@ -524,7 +526,7 @@
CURRENT_TEST="$MYSQL_TEST_DIR/var/log/current_test"
SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M"
-export MASTER_MYPORT SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1
+export MASTER_MYHOST MASTER_MYPORT SLAVE_MYHOST SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1
NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgm-extra-opts=$NDB_MGM_EXTRA_OPTS --ndb_mgmd-extra-opts=$NDB_MGMD_EXTRA_OPTS --ndbd-extra-opts=$NDBD_EXTRA_OPTS"
NDBCLUSTER_OPTS_SLAVE="--port=$NDBCLUSTER_PORT_SLAVE --data-dir=$MYSQL_TEST_DIR/var"
--- 1.27/mysql-test/r/rpl_until.result 2005-04-18 13:14:00 +02:00
+++ 1.28/mysql-test/r/rpl_until.result 2005-05-12 16:36:53 +02:00
@@ -31,7 +31,7 @@
4
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 325 # Master master-bin.000001 325 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No # 0 0 325 # Master master-bin.000001 325 No #
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=295;
select * from t1;
n
@@ -41,7 +41,7 @@
4
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 325 # Master master-no-such-bin.000001 295 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No # 0 0 325 # Master master-no-such-bin.000001 295 No #
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=751;
select * from t2;
n
@@ -49,13 +49,13 @@
2
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 617 # Relay slave-relay-bin.000004 751 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No # 0 0 617 # Relay slave-relay-bin.000004 751 No #
start slave;
stop slave;
start slave until master_log_file='master-bin.000001', master_log_pos=787;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 787 # Master master-bin.000001 787 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No # 0 0 787 # Master master-bin.000001 787 No #
start slave until master_log_file='master-bin', master_log_pos=565;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until master_log_file='master-bin.000001', master_log_pos=565, relay_log_pos=16;
--- 1.23/mysql-test/r/rpl_change_master.result 2005-04-18 13:14:00 +02:00
+++ 1.24/mysql-test/r/rpl_change_master.result 2005-05-12 16:36:52 +02:00
@@ -13,11 +13,11 @@
stop slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 364 # # master-bin.000001 No No 0 0 188 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 361 # # master-bin.000001 No No # 0 0 187 # None 0 No #
change master to master_user='root';
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 188 # # master-bin.000001 No No 0 0 188 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 187 # # master-bin.000001 No No # 0 0 187 # None 0 No #
start slave;
select * from t1;
n
--- 1.9/mysql-test/r/rpl_deadlock.result 2005-04-18 13:14:00 +02:00
+++ 1.10/mysql-test/r/rpl_deadlock.result 2005-05-12 16:36:53 +02:00
@@ -45,9 +45,9 @@
22
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 18915 # # master-bin.000001 Yes Yes # 0 0 18915 # None 0 No #
stop slave;
-change master to master_log_pos=540;
+change master to master_log_pos=536;
begin;
select * from t2 for update;
a
@@ -63,10 +63,10 @@
22
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 18915 # # master-bin.000001 Yes Yes # 0 0 18915 # None 0 No #
set global max_relay_log_size=0;
stop slave;
-change master to master_log_pos=540;
+change master to master_log_pos=536;
begin;
select * from t2 for update;
a
@@ -83,5 +83,5 @@
22
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 18915 # # master-bin.000001 Yes Yes # 0 0 18915 # None 0 No #
drop table t1,t2;
--- 1.26/mysql-test/r/rpl_error_ignored_table.result 2005-04-18 13:14:00 +02:00
+++ 1.27/mysql-test/r/rpl_error_ignored_table.result 2005-05-12 16:36:53 +02:00
@@ -9,7 +9,7 @@
ERROR 23000: Duplicate entry '1' for key 1
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 294 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 294 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 292 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 292 # None 0 No #
show tables like 't1';
Tables_in_test (t1)
drop table t1;
--- 1.26/mysql-test/r/rpl_max_relay_size.result 2005-04-18 13:14:00 +02:00
+++ 1.27/mysql-test/r/rpl_max_relay_size.result 2005-05-12 16:36:53 +02:00
@@ -16,7 +16,7 @@
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 72956 # # master-bin.000001 Yes Yes # 0 0 72956 # None 0 No #
stop slave;
reset slave;
set global max_relay_log_size=(5*4096);
@@ -26,7 +26,7 @@
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 72956 # # master-bin.000001 Yes Yes # 0 0 72956 # None 0 No #
stop slave;
reset slave;
set global max_relay_log_size=0;
@@ -36,26 +36,26 @@
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 72956 # # master-bin.000001 Yes Yes # 0 0 72956 # None 0 No #
stop slave;
reset slave;
flush logs;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 4 # # No No 0 0 0 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 4 # # No No # 0 0 0 # None 0 No #
reset slave;
start slave;
flush logs;
create table t1 (a int);
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73845 # # master-bin.000001 Yes Yes 0 0 73845 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73042 # # master-bin.000001 Yes Yes # 0 0 73042 # None 0 No #
flush logs;
drop table t1;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73922 # # master-bin.000001 Yes Yes 0 0 73922 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73118 # # master-bin.000001 Yes Yes # 0 0 73118 # None 0 No #
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000002 102 cluster_replication
+master-bin.000002 102 <Binlog_Ignore_DB>
--- 1.23/mysql-test/r/rpl_relayrotate.result 2005-04-18 13:14:00 +02:00
+++ 1.24/mysql-test/r/rpl_relayrotate.result 2005-05-12 16:36:53 +02:00
@@ -18,5 +18,5 @@
8000
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 743192 # # master-bin.000001 Yes Yes 0 0 743192 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 735190 # # master-bin.000001 Yes Yes # 0 0 735190 # None 0 No #
drop table t1;
--- 1.18/mysql-test/r/rpl_reset_slave.result 2005-04-18 12:57:12 +02:00
+++ 1.19/mysql-test/r/rpl_reset_slave.result 2005-05-12 16:36:53 +02:00
@@ -6,20 +6,20 @@
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 Yes Yes 0 0 102 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 Yes Yes # 0 0 102 # None 0 No #
stop slave;
change master to master_user='test';
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 test MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 No No 0 0 102 # None 0 No #
+# 127.0.0.1 test MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 No No # 0 0 102 # None 0 No #
reset slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 4 # # No No 0 0 0 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 4 # # No No # 0 0 0 # None 0 No #
start slave;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 Yes Yes 0 0 102 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 Yes Yes # 0 0 102 # None 0 No #
stop slave;
reset slave;
start slave;
--- 1.12/mysql-test/r/rpl_server_id1.result 2005-04-18 12:57:12 +02:00
+++ 1.13/mysql-test/r/rpl_server_id1.result 2005-05-12 16:36:53 +02:00
@@ -10,7 +10,7 @@
change master to master_port=SLAVE_PORT;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
- 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 102 None 0 No NULL
+ 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # # 0 0 0 102 None 0 No NULL
start slave;
insert into t1 values (1);
show status like "slave_running";
--- 1.1/mysql-test/t/rpl000001_row.test 2005-05-11 08:58:49 +02:00
+++ 1.2/mysql-test/t/rpl000001_row.test 2005-05-12 16:36:53 +02:00
@@ -1,5 +1,5 @@
-source include/master-slave.inc;
-source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
--disable_warnings
drop table if exists t1,t2,t3;
--- 1.1/mysql-test/t/rpl_row_charset.test 2005-05-11 08:58:56 +02:00
+++ 1.2/mysql-test/t/rpl_row_charset.test 2005-05-12 16:36:53 +02:00
@@ -1,8 +1,8 @@
# Replication of character sets.
# This test will fail if the server/client does not support enough charsets.
-source include/master-slave.inc;
-source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
--disable_warnings
set timestamp=1000000000;
--- 1.1/mysql-test/t/rpl_row_ps.test 2005-05-11 08:58:57 +02:00
+++ 1.2/mysql-test/t/rpl_row_ps.test 2005-05-12 16:36:53 +02:00
@@ -1,8 +1,8 @@
#
# Test of replicating user variables
#
-source include/master-slave.inc;
-source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
+-- source include/have_binlog_format_row.inc
#save_master_pos;
#connection slave;
--- 1.4/mysql-test/t/rpl_row_trans.test 2005-04-29 11:34:43 +02:00
+++ 1.5/mysql-test/t/rpl_row_trans.test 2005-05-12 16:36:53 +02:00
@@ -1,5 +1,5 @@
---source include/have_binlog_format_row.inc
-source include/master-slave.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
let $VERSION=`select version()`;
--- 1.29/mysql-test/r/rpl_flush_log_loop.result 2005-04-18 13:14:00 +02:00
+++ 1.30/mysql-test/r/rpl_flush_log_loop.result 2005-05-12 16:36:53 +02:00
@@ -14,4 +14,4 @@
flush logs;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 213 # # slave-bin.000001 Yes Yes 0 0 213 # None 0 No #
+# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 944 # # slave-bin.000001 Yes Yes # 0 0 578 # None 0 No #
--- 1.10/mysql-test/t/rpl_flush_log_loop.test 2005-05-12 12:05:54 +02:00
+++ 1.11/mysql-test/t/rpl_flush_log_loop.test 2005-05-12 16:36:53 +02:00
@@ -1,7 +1,7 @@
# Testing if "flush logs" command bouncing resulting in logs created in a loop
# in case of bi-directional replication
-source include/master-slave.inc
+-- source include/master-slave.inc
connection slave;
--replace_result $MASTER_MYPORT MASTER_PORT
--- 1.8/mysql-test/t/rpl_insert_id.test 2005-02-23 19:54:12 +01:00
+++ 1.9/mysql-test/t/rpl_insert_id.test 2005-05-12 16:36:53 +02:00
@@ -3,8 +3,9 @@
# We also check how the foreign_key_check variable is replicated
-source include/master-slave.inc;
-source include/have_innodb.inc
+-- source include/have_innodb.inc
+-- source include/master-slave.inc
+
connection master;
create table t1(a int auto_increment, key(a));
create table t2(b int auto_increment, c int, key(b));
--- 1.35/mysql-test/r/rpl_replicate_do.result 2005-04-18 13:14:00 +02:00
+++ 1.36/mysql-test/r/rpl_replicate_do.result 2005-05-12 16:36:53 +02:00
@@ -28,4 +28,4 @@
drop table if exists t1,t2,t11;
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1672 # # master-bin.000001 Yes Yes test.t1 0 0 1672 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1662 # # master-bin.000001 Yes Yes test.t1 # 0 0 1662 # None 0 No #
--- 1.47/mysql-test/r/rpl_log_pos.result 2005-04-18 13:14:00 +02:00
+++ 1.48/mysql-test/r/rpl_log_pos.result 2005-05-12 16:36:53 +02:00
@@ -6,7 +6,7 @@
start slave;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 102 cluster_replication
+master-bin.000001 102 <Binlog_Ignore_DB>
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 Yes Yes 0 0 102 # None 0 No #
@@ -30,7 +30,7 @@
# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 177 # # master-bin.000001 No Yes 0 0 177 # None 0 No #
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 102 cluster_replication
+master-bin.000001 102 <Binlog_Ignore_DB>
create table if not exists t1 (n int);
drop table if exists t1;
create table t1 (n int);
--- 1.40/mysql-test/t/rpl000001.test 2005-05-11 09:08:54 +02:00
+++ 1.41/mysql-test/t/rpl000001.test 2005-05-12 16:36:53 +02:00
@@ -1,5 +1,5 @@
-source include/master-slave.inc;
-source include/have_binlog_format_statement.inc
+-- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
create table t1 (word char(20) not null);
load data infile '../../std_data/words.dat' into table t1;
--- 1.18/mysql-test/t/rpl000012.test 2005-05-11 09:08:54 +02:00
+++ 1.19/mysql-test/t/rpl000012.test 2005-05-12 16:36:53 +02:00
@@ -1,6 +1,5 @@
-source include/master-slave.inc;
-source include/have_binlog_format_statement.inc
-connection master;
+-- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
create table t2 (n int);
create temporary table t1 (n int);
--- 1.36/mysql-test/t/rpl_log_pos.test 2005-04-29 02:45:17 +02:00
+++ 1.37/mysql-test/t/rpl_log_pos.test 2005-05-12 16:36:53 +02:00
@@ -6,6 +6,7 @@
-- source include/have_binlog_format_statement.inc
source include/master-slave.inc;
+--replace_column 3 <Binlog_Ignore_DB>
show master status;
sync_slave_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT
@@ -34,6 +35,7 @@
--replace_column 1 # 8 # 9 # 23 # 33 #
show slave status;
connection master;
+--replace_column 3 <Binlog_Ignore_DB>
show master status;
create table if not exists t1 (n int);
drop table if exists t1;
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.1850) | tomas | 13 May |
