Below is the list of changes that have just been committed into a local
5.1 repository of mysqldev. When mysqldev 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.1855 05/04/08 18:44:31 lars@stripped +21 -0
Post-merge fixed in separate development clone for WL#2325.
mysql-test/t/rpl_row_basic.disabled
1.1 05/04/08 18:44:22 lars@stripped +1 -0
mysql-test/t/rpl_row_basic.disabled
1.0 05/04/08 18:44:22 lars@stripped +0 -0
BitKeeper file /data0/mysqldev/lars/mysql-test/t/rpl_row_basic.disabled
sql/sql_show.cc
1.227 05/04/08 18:40:59 lars@stripped +1 -1
Post-merge fixes
mysql-test/t/rpl_until.test
1.18 05/04/08 18:40:59 lars@stripped +4 -4
Post-merge fixes
mysql-test/t/rpl_deadlock.test
1.7 05/04/08 18:40:59 lars@stripped +2 -2
Post-merge fixes
mysql-test/t/mysqlbinlog2.test
1.8 05/04/08 18:40:59 lars@stripped +6 -6
Post-merge fixes
mysql-test/t/mysqlbinlog.test
1.19 05/04/08 18:40:59 lars@stripped +2 -2
Post-merge fixes
mysql-test/r/user_var.result
1.33 05/04/08 18:40:59 lars@stripped +6 -0
Post-merge fixes
mysql-test/r/rpl_until.result
1.26 05/04/08 18:40:59 lars@stripped +18 -17
Post-merge fixes
mysql-test/r/rpl_rotate_logs.result
1.72 05/04/08 18:40:59 lars@stripped +4 -4
Post-merge fixes
mysql-test/r/rpl_replicate_do.result
1.34 05/04/08 18:40:59 lars@stripped +1 -1
Post-merge fixes
mysql-test/r/rpl_relayrotate.result
1.22 05/04/08 18:40:59 lars@stripped +1 -1
Post-merge fixes
mysql-test/r/rpl_max_relay_size.result
1.25 05/04/08 18:40:59 lars@stripped +5 -5
Post-merge fixes
mysql-test/r/rpl_log.result
1.62 05/04/08 18:40:59 lars@stripped +41 -41
Post-merge fixes
mysql-test/r/rpl_loaddata.result
1.33 05/04/08 18:40:59 lars@stripped +20 -7
Post-merge fixes
mysql-test/r/rpl_flush_log_loop.result
1.28 05/04/08 18:40:59 lars@stripped +1 -1
Post-merge fixes
mysql-test/r/rpl_error_ignored_table.result
1.25 05/04/08 18:40:59 lars@stripped +1 -1
Post-merge fixes
mysql-test/r/rpl_deadlock.result
1.8 05/04/08 18:40:59 lars@stripped +5 -5
Post-merge fixes
mysql-test/r/rpl_change_master.result
1.22 05/04/08 18:40:59 lars@stripped +2 -2
Post-merge fixes
mysql-test/r/mix_innodb_myisam_binlog.result
1.26 05/04/08 18:40:59 lars@stripped +39 -39
Post-merge fixes
mysql-test/r/innodb.result
1.106 05/04/08 18:40:59 lars@stripped +1 -1
This should be checked!
mysql-test/r/information_schema.result
1.42 05/04/08 18:40:59 lars@stripped +1 -1
This should be checked!
# 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: lars
# Host: production.mysql.com
# Root: /data0/mysqldev/lars
--- 1.226/sql/sql_show.cc 2005-04-08 14:24:18 +02:00
+++ 1.227/sql/sql_show.cc 2005-04-08 18:40:59 +02:00
@@ -1625,7 +1625,7 @@
static bool schema_table_store_record(THD *thd, TABLE *table)
{
int error;
- if ((error= table->file->write_row(table->record[0])))
+ if ((error= table->file->ha_write_row(table->record[0])))
{
if (create_myisam_from_heap(thd, table,
table->pos_in_table_list->schema_table_param,
--- 1.25/mysql-test/r/rpl_until.result 2005-04-08 14:24:18 +02:00
+++ 1.26/mysql-test/r/rpl_until.result 2005-04-08 18:40:59 +02:00
@@ -15,14 +15,14 @@
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 224 Query 1 325 use `test`; insert into t1 values (1),(2),(3),(4)
-master-bin.000001 325 Query 1 402 use `test`; drop table t1
-master-bin.000001 402 Query 1 524 use `test`; create table t2(n int not null auto_increment primary key)
-master-bin.000001 524 Query 1 617 use `test`; insert into t2 values (1),(2)
-master-bin.000001 617 Query 1 710 use `test`; insert into t2 values (3),(4)
-master-bin.000001 710 Query 1 787 use `test`; drop table t2
-start slave until master_log_file='master-bin.000001', master_log_pos=325;
+master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 223 Query 1 323 use `test`; insert into t1 values (1),(2),(3),(4)
+master-bin.000001 323 Query 1 399 use `test`; drop table t1
+master-bin.000001 399 Query 1 520 use `test`; create table t2(n int not null auto_increment primary key)
+master-bin.000001 520 Query 1 612 use `test`; insert into t2 values (1),(2)
+master-bin.000001 612 Query 1 704 use `test`; insert into t2 values (3),(4)
+master-bin.000001 704 Query 1 780 use `test`; drop table t2
+start slave until master_log_file='master-bin.000001', master_log_pos=323;
select * from t1;
n
1
@@ -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 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 323 # Master master-bin.000001 323 No #
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=295;
select * from t1;
n
@@ -41,32 +41,33 @@
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 #
-start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=751;
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 323 # Master master-no-such-bin.000001 295 No #
+start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
select * from t2;
n
1
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 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 612 # Relay slave-relay-bin.000004 746 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 #
-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;
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 780 slave-relay-bin.000004 # master-bin.000001 Yes Yes 0 0 780 # Master master-bin.000001 787 No #
+start slave until master_log_file='master-bin', master_log_pos=560;
+start slave until master_log_file='master-bin.000001', master_log_pos=560, relay_log_pos=16;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until master_log_file='master-bin.000001';
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until relay_log_file='slave-relay-bin.000002';
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=565;
+start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=560;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave sql_thread;
+Warnings:
+Note 1254 Slave is already running
start slave until master_log_file='master-bin.000001', master_log_pos=787;
Warnings:
Note 1254 Slave is already running
--- 1.18/mysql-test/t/mysqlbinlog.test 2005-04-08 14:24:18 +02:00
+++ 1.19/mysql-test/t/mysqlbinlog.test 2005-04-08 18:40:59 +02:00
@@ -60,7 +60,7 @@
select "--- --position --" as "";
--enable_query_log
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=236 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=235 $MYSQL_TEST_DIR/var/log/master-bin.000002
# These are tests for remote binlog.
# They should return the same as previous test.
@@ -92,7 +92,7 @@
select "--- --position --" as "";
--enable_query_log
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=236 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=235 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
# Bug#7853 (mysqlbinlog does not accept input from stdin)
--disable_query_log
--- 1.17/mysql-test/t/rpl_until.test 2005-04-08 14:24:18 +02:00
+++ 1.18/mysql-test/t/rpl_until.test 2005-04-08 18:40:59 +02:00
@@ -24,7 +24,7 @@
# try to replicate all queries until drop of t1
connection slave;
-start slave until master_log_file='master-bin.000001', master_log_pos=325;
+start slave until master_log_file='master-bin.000001', master_log_pos=323;
sleep 2;
# here table should be still not deleted
select * from t1;
@@ -68,15 +68,15 @@
#testing various error conditions
--error 1277
-start slave until master_log_file='master-bin', master_log_pos=565;
+start slave until master_log_file='master-bin', master_log_pos=560;
--error 1277
-start slave until master_log_file='master-bin.000001', master_log_pos=565, relay_log_pos=16;
+start slave until master_log_file='master-bin.000001', master_log_pos=560, relay_log_pos=16;
--error 1277
start slave until master_log_file='master-bin.000001';
--error 1277
start slave until relay_log_file='slave-relay-bin.000002';
--error 1277
-start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=565;
+start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=560;
# Warning should be given for second command
start slave sql_thread;
start slave until master_log_file='master-bin.000001', master_log_pos=787;
--- 1.41/mysql-test/r/information_schema.result 2005-04-08 13:30:48 +02:00
+++ 1.42/mysql-test/r/information_schema.result 2005-04-08 18:40:59 +02:00
@@ -656,7 +656,7 @@
CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
count(*)
-100
+101
drop view a2, a1;
drop table t_crashme;
select table_schema,table_name, column_name from
--- 1.25/mysql-test/r/mix_innodb_myisam_binlog.result 2005-04-08 14:24:17 +02:00
+++ 1.26/mysql-test/r/mix_innodb_myisam_binlog.result 2005-04-08 18:40:59 +02:00
@@ -9,9 +9,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 171 Query 1 # use `test`; insert into t1 values(1)
-master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 354 Xid 1 # COMMIT /* xid=7 */
+master-bin.000001 170 Query 1 # use `test`; insert into t1 values(1)
+master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 351 Xid 1 # COMMIT /* xid=7 */
delete from t1;
delete from t2;
reset master;
@@ -24,9 +24,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 171 Query 1 # use `test`; insert into t1 values(2)
-master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 354 Query 1 # use `test`; ROLLBACK
+master-bin.000001 170 Query 1 # use `test`; insert into t1 values(2)
+master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 351 Query 1 # use `test`; ROLLBACK
delete from t1;
delete from t2;
reset master;
@@ -42,12 +42,12 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 171 Query 1 # use `test`; insert into t1 values(3)
-master-bin.000001 259 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 345 Query 1 # use `test`; insert into t1 values(4)
-master-bin.000001 433 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 528 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 626 Xid 1 # COMMIT /* xid=24 */
+master-bin.000001 170 Query 1 # use `test`; insert into t1 values(3)
+master-bin.000001 257 Query 1 # use `test`; savepoint my_savepoint
+master-bin.000001 342 Query 1 # use `test`; insert into t1 values(4)
+master-bin.000001 429 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 523 Query 1 # use `test`; rollback to savepoint my_savepoint
+master-bin.000001 620 Xid 1 # COMMIT /* xid=24 */
delete from t1;
delete from t2;
reset master;
@@ -68,13 +68,13 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 171 Query 1 # use `test`; insert into t1 values(5)
-master-bin.000001 259 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 345 Query 1 # use `test`; insert into t1 values(6)
-master-bin.000001 433 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 528 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 626 Query 1 # use `test`; insert into t1 values(7)
-master-bin.000001 714 Xid 1 # COMMIT /* xid=36 */
+master-bin.000001 170 Query 1 # use `test`; insert into t1 values(5)
+master-bin.000001 257 Query 1 # use `test`; savepoint my_savepoint
+master-bin.000001 342 Query 1 # use `test`; insert into t1 values(6)
+master-bin.000001 429 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 523 Query 1 # use `test`; rollback to savepoint my_savepoint
+master-bin.000001 620 Query 1 # use `test`; insert into t1 values(7)
+master-bin.000001 707 Xid 1 # COMMIT /* xid=36 */
delete from t1;
delete from t2;
reset master;
@@ -90,9 +90,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 171 Query 1 # use `test`; insert into t1 values(8)
-master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 354 Query 1 # use `test`; ROLLBACK
+master-bin.000001 170 Query 1 # use `test`; insert into t1 values(8)
+master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 351 Query 1 # use `test`; ROLLBACK
delete from t1;
delete from t2;
reset master;
@@ -101,8 +101,8 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; insert into t1 values(9)
-master-bin.000001 190 Xid 1 # COMMIT /* xid=59 */
-master-bin.000001 217 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 189 Xid 1 # COMMIT /* xid=59 */
+master-bin.000001 216 Query 1 # use `test`; insert into t2 select * from t1
delete from t1;
delete from t2;
reset master;
@@ -112,18 +112,18 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 191 Xid 1 # COMMIT /* xid=65 */
-master-bin.000001 218 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 190 Xid 1 # COMMIT /* xid=65 */
+master-bin.000001 217 Query 1 # use `test`; insert into t2 select * from t1
insert into t1 values(11);
commit;
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 191 Xid 1 # COMMIT /* xid=65 */
-master-bin.000001 218 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 313 Query 1 # use `test`; BEGIN
-master-bin.000001 382 Query 1 # use `test`; insert into t1 values(11)
-master-bin.000001 471 Xid 1 # COMMIT /* xid=67 */
+master-bin.000001 190 Xid 1 # COMMIT /* xid=65 */
+master-bin.000001 217 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 311 Query 1 # use `test`; BEGIN
+master-bin.000001 379 Query 1 # use `test`; insert into t1 values(11)
+master-bin.000001 467 Xid 1 # COMMIT /* xid=67 */
alter table t2 engine=INNODB;
delete from t1;
delete from t2;
@@ -135,9 +135,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 171 Query 1 # use `test`; insert into t1 values(12)
-master-bin.000001 260 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 355 Xid 1 # COMMIT /* xid=77 */
+master-bin.000001 170 Query 1 # use `test`; insert into t1 values(12)
+master-bin.000001 258 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 352 Xid 1 # COMMIT /* xid=77 */
delete from t1;
delete from t2;
reset master;
@@ -160,8 +160,8 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 171 Query 1 # use `test`; insert into t1 values(14)
-master-bin.000001 260 Xid 1 # COMMIT /* xid=93 */
+master-bin.000001 170 Query 1 # use `test`; insert into t1 values(14)
+master-bin.000001 258 Xid 1 # COMMIT /* xid=93 */
delete from t1;
delete from t2;
reset master;
@@ -180,9 +180,9 @@
show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 102 Query 1 # use `test`; BEGIN
-master-bin.000001 171 Query 1 # use `test`; insert into t1 values(16)
-master-bin.000001 260 Query 1 # use `test`; insert into t1 values(18)
-master-bin.000001 349 Xid 1 # COMMIT /* xid=104 */
+master-bin.000001 170 Query 1 # use `test`; insert into t1 values(16)
+master-bin.000001 258 Query 1 # use `test`; insert into t1 values(18)
+master-bin.000001 346 Xid 1 # COMMIT /* xid=104 */
delete from t1;
delete from t2;
alter table t2 type=MyISAM;
--- 1.21/mysql-test/r/rpl_change_master.result 2005-04-08 14:24:17 +02:00
+++ 1.22/mysql-test/r/rpl_change_master.result 2005-04-08 18:40:59 +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.7/mysql-test/r/rpl_deadlock.result 2005-04-08 14:24:17 +02:00
+++ 1.8/mysql-test/r/rpl_deadlock.result 2005-04-08 18:40:59 +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.24/mysql-test/r/rpl_error_ignored_table.result 2005-04-08 14:24:17 +02:00
+++ 1.25/mysql-test/r/rpl_error_ignored_table.result 2005-04-08 18:40:59 +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.24/mysql-test/r/rpl_max_relay_size.result 2005-04-08 14:24:17 +02:00
+++ 1.25/mysql-test/r/rpl_max_relay_size.result 2005-04-08 18:40:59 +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,7 +36,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;
flush logs;
@@ -49,12 +49,12 @@
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
--- 1.21/mysql-test/r/rpl_relayrotate.result 2005-04-08 14:24:18 +02:00
+++ 1.22/mysql-test/r/rpl_relayrotate.result 2005-04-08 18:40:59 +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.7/mysql-test/t/mysqlbinlog2.test 2005-04-08 14:24:18 +02:00
+++ 1.8/mysql-test/t/mysqlbinlog2.test 2005-04-08 18:40:59 +02:00
@@ -46,11 +46,11 @@
--disable_query_log
select "--- start-position --" as "";
--enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQL_TEST_DIR/var/log/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --start-position=604 $MYSQL_TEST_DIR/var/log/master-bin.000001
--disable_query_log
select "--- stop-position --" as "";
--enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=608 $MYSQL_TEST_DIR/var/log/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --stop-position=604 $MYSQL_TEST_DIR/var/log/master-bin.000001
--disable_query_log
select "--- start-datetime --" as "";
--enable_query_log
@@ -75,7 +75,7 @@
--disable_query_log
select "--- start-position --" as "";
--enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --start-position=604 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
--disable_query_log
select "--- stop-position --" as "";
--enable_query_log
@@ -102,11 +102,11 @@
--disable_query_log
select "--- start-position --" as "";
--enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
+--exec $MYSQL_BINLOG --short-form --start-position=604 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
--disable_query_log
select "--- stop-position --" as "";
--enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
+--exec $MYSQL_BINLOG --short-form --stop-position=604 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
--disable_query_log
select "--- start-datetime --" as "";
--enable_query_log
@@ -129,7 +129,7 @@
--disable_query_log
select "--- start-position --" as "";
--enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
+--exec $MYSQL_BINLOG --short-form --start-position=604 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
--disable_query_log
select "--- stop-position --" as "";
--enable_query_log
--- 1.6/mysql-test/t/rpl_deadlock.test 2005-04-08 14:24:18 +02:00
+++ 1.7/mysql-test/t/rpl_deadlock.test 2005-04-08 18:40:59 +02:00
@@ -72,7 +72,7 @@
# 2) Test lock wait timeout
stop slave;
-change master to master_log_pos=540; # the BEGIN log event
+change master to master_log_pos=536; # the BEGIN log event
begin;
select * from t2 for update; # hold lock
start slave;
@@ -93,7 +93,7 @@
# This is really copy-paste of 2) of above
stop slave;
-change master to master_log_pos=540;
+change master to master_log_pos=536;
begin;
select * from t2 for update;
start slave;
--- New file ---
+++ mysql-test/t/rpl_row_basic.disabled 05/04/08 18:44:22
Does not work. For Mats to fix.
--- 1.105/mysql-test/r/innodb.result 2005-03-21 23:26:17 +01:00
+++ 1.106/mysql-test/r/innodb.result 2005-04-08 18:40:59 +02:00
@@ -1923,7 +1923,7 @@
11
select count(*) from t1 where t like 'a%';
count(*)
-10
+11
select count(*) from t1 where v like 'a %';
count(*)
9
--- 1.27/mysql-test/r/rpl_flush_log_loop.result 2005-04-08 14:24:17 +02:00
+++ 1.28/mysql-test/r/rpl_flush_log_loop.result 2005-04-08 18:40:59 +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 212 # # slave-bin.000001 Yes Yes 0 0 212 # None 0 No #
--- 1.32/mysql-test/r/rpl_loaddata.result 2005-04-08 14:24:17 +02:00
+++ 1.33/mysql-test/r/rpl_loaddata.result 2005-04-08 18:40:59 +02:00
@@ -3,7 +3,7 @@
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;}
+start slave;
reset master;
create table t1(a int not null auto_increment, b int, primary key(a) );
load data infile '../../std_data/rpl_loaddata.dat' into table t1;
@@ -22,7 +22,7 @@
2003-03-22 2416 a bbbbb
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-slave-bin.000001 1296
+slave-bin.000001 1290
drop table t1;
drop table t2;
drop table t3;
@@ -33,7 +33,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 1804 # # master-bin.000001 Yes Yes 0 0 1804 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1793 # # master-bin.000001 Yes Yes 0 0 1793 # None 0 No #
set sql_log_bin=0;
delete from t1;
set sql_log_bin=1;
@@ -43,7 +43,7 @@
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_PORT 1 master-bin.000001 1839 # # master-bin.000001 No No 0 0 1839 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1828 # # master-bin.000001 No No 0 0 1828 # None 0 No #
set global sql_slave_skip_counter=1;
start slave;
set sql_log_bin=0;
@@ -62,7 +62,20 @@
terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
'\n##\n' starting by '>' ignore 1 lines;
ERROR 23000: Duplicate entry '2003-03-22' for key 1
-show master status;
-File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 445 cluster_replication
+select * from t2;
+day id category name
+2003-02-22 2461 b a a a @ % ' " a
+2003-03-22 2161 c asdf
+start slave;
+select * from t2;
+day id category name
+2003-02-22 2461 b a a a @ % ' " a
+2003-03-22 2161 c asdf
+alter table t2 drop key day;
+delete from t2;
+load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields
+terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
+'\n##\n' starting by '>' ignore 1 lines;
+ERROR 23000: Duplicate entry '2003-03-22' for key 1
+drop table t2;
drop table t2;
--- 1.33/mysql-test/r/rpl_replicate_do.result 2005-04-08 14:24:18 +02:00
+++ 1.34/mysql-test/r/rpl_replicate_do.result 2005-04-08 18:40:59 +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.71/mysql-test/r/rpl_rotate_logs.result 2005-04-08 14:24:18 +02:00
+++ 1.72/mysql-test/r/rpl_rotate_logs.result 2005-04-08 18:40:59 +02:00
@@ -16,7 +16,7 @@
insert into t1 values('Could not break slave'),('Tried hard');
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 60 master-bin.000001 556 # # master-bin.000001 Yes Yes 0 0 556 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000001 552 # # master-bin.000001 Yes Yes 0 0 552 # None 0 No #
select * from t1;
s
Could not break slave
@@ -57,7 +57,7 @@
insert into t2 values (65);
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 60 master-bin.000003 504 # # master-bin.000003 Yes Yes 0 0 504 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000003 500 # # master-bin.000003 Yes Yes 0 0 500 # None 0 No #
select * from t2;
m
34
@@ -79,13 +79,13 @@
master-bin.000005
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000005 2150 cluster_replication
+master-bin.000005 2036 cluster_replication
select * from t4;
a
testing temporary tables part 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_PORT 60 master-bin.000005 2150 # # master-bin.000005 Yes Yes 0 0 2150 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000005 2036 # # master-bin.000005 Yes Yes 0 0 2036 # None 0 No #
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)
--- 1.61/mysql-test/r/rpl_log.result 2005-04-08 14:24:17 +02:00
+++ 1.62/mysql-test/r/rpl_log.result 2005-04-08 18:40:59 +02:00
@@ -20,24 +20,24 @@
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 224 Intvar 1 252 INSERT_ID=1
-master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
-master-bin.000001 344 Query 1 421 use `test`; drop table t1
-master-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
-master-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
-master-bin.000001 1129 Execute_load_query 1 1278 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001 1278 Query 1 1355 use `test`; drop table t1
+master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 223 Intvar 1 251 INSERT_ID=1
+master-bin.000001 251 Query 1 342 use `test`; insert into t1 values (NULL)
+master-bin.000001 342 Query 1 418 use `test`; drop table t1
+master-bin.000001 418 Query 1 521 use `test`; create table t1 (word char(20) not null)
+master-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
+master-bin.000001 1125 Execute_load_query 1 1273 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001 1273 Query 1 1349 use `test`; drop table t1
show binlog events from 102 limit 1;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
show binlog events from 102 limit 2;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 224 Intvar 1 252 INSERT_ID=1
+master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 223 Intvar 1 251 INSERT_ID=1
show binlog events from 102 limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
+master-bin.000001 251 Query 1 342 use `test`; insert into t1 values (NULL)
flush logs;
create table t5 (a int);
drop table t5;
@@ -50,23 +50,23 @@
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 224 Intvar 1 252 INSERT_ID=1
-master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
-master-bin.000001 344 Query 1 421 use `test`; drop table t1
-master-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
-master-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
-master-bin.000001 1129 Execute_load_query 1 1278 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001 1278 Query 1 1355 use `test`; drop table t1
-master-bin.000001 1355 Rotate 1 1399 master-bin.000002;pos=4
+master-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 223 Intvar 1 251 INSERT_ID=1
+master-bin.000001 251 Query 1 342 use `test`; insert into t1 values (NULL)
+master-bin.000001 342 Query 1 418 use `test`; drop table t1
+master-bin.000001 418 Query 1 521 use `test`; create table t1 (word char(20) not null)
+master-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
+master-bin.000001 1125 Execute_load_query 1 1273 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001 1273 Query 1 1349 use `test`; drop table t1
+master-bin.000001 1349 Rotate 1 1393 master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
-master-bin.000002 102 Query 1 189 use `test`; create table t5 (a int)
-master-bin.000002 189 Query 1 266 use `test`; drop table t5
-master-bin.000002 266 Query 1 353 use `test`; create table t1 (n int)
-master-bin.000002 353 Query 1 442 use `test`; insert into t1 values (1)
-master-bin.000002 442 Query 1 519 use `test`; drop table t1
+master-bin.000002 102 Query 1 188 use `test`; create table t5 (a int)
+master-bin.000002 188 Query 1 264 use `test`; drop table t5
+master-bin.000002 264 Query 1 350 use `test`; create table t1 (n int)
+master-bin.000002 350 Query 1 438 use `test`; insert into t1 values (1)
+master-bin.000002 438 Query 1 514 use `test`; drop table t1
show binary logs;
Log_name
master-bin.000001
@@ -79,25 +79,25 @@
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 4 Format_desc 2 102 Server ver: VERSION, Binlog ver: 4
-slave-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
-slave-bin.000001 224 Intvar 1 252 INSERT_ID=1
-slave-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
-slave-bin.000001 344 Query 1 421 use `test`; drop table t1
-slave-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
-slave-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
-slave-bin.000001 1129 Execute_load_query 1 1287 use `test`; load data INFILE '../../var/tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
-slave-bin.000001 1287 Query 1 1364 use `test`; drop table t1
-slave-bin.000001 1364 Query 1 1451 use `test`; create table t5 (a int)
-slave-bin.000001 1451 Query 1 1528 use `test`; drop table t5
-slave-bin.000001 1528 Rotate 2 1571 slave-bin.000002;pos=4
+slave-bin.000001 102 Query 1 223 use `test`; create table t1(n int not null auto_increment primary key)
+slave-bin.000001 223 Intvar 1 251 INSERT_ID=1
+slave-bin.000001 251 Query 1 342 use `test`; insert into t1 values (NULL)
+slave-bin.000001 342 Query 1 418 use `test`; drop table t1
+slave-bin.000001 418 Query 1 521 use `test`; create table t1 (word char(20) not null)
+slave-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
+slave-bin.000001 1125 Execute_load_query 1 1282 use `test`; load data INFILE '../../var/tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
+slave-bin.000001 1282 Query 1 1358 use `test`; drop table t1
+slave-bin.000001 1358 Query 1 1444 use `test`; create table t5 (a int)
+slave-bin.000001 1444 Query 1 1520 use `test`; drop table t5
+slave-bin.000001 1520 Rotate 2 1563 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 4 Format_desc 2 102 Server ver: VERSION, Binlog ver: 4
-slave-bin.000002 102 Query 1 189 use `test`; create table t1 (n int)
-slave-bin.000002 189 Query 1 278 use `test`; insert into t1 values (1)
-slave-bin.000002 278 Query 1 355 use `test`; drop table t1
+slave-bin.000002 102 Query 1 188 use `test`; create table t1 (n int)
+slave-bin.000002 188 Query 1 276 use `test`; insert into t1 values (1)
+slave-bin.000002 276 Query 1 352 use `test`; 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.000002 519 # # master-bin.000002 Yes Yes 0 0 519 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 514 # # master-bin.000002 Yes Yes 0 0 514 # None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
--- 1.32/mysql-test/r/user_var.result 2005-04-08 13:30:49 +02:00
+++ 1.33/mysql-test/r/user_var.result 2005-04-08 18:40:59 +02:00
@@ -176,7 +176,13 @@
set @var1= "';aaa";
SET @var2=char(ascii('a'));
insert into t1 values (@var1),(@var2);
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # User var 1 # @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
+master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES(@`a b`)
+master-bin.000001 # User var 1 # @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
+master-bin.000001 # User var 1 # @`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
+master-bin.000001 # Query 1 # use `test`; insert into t1 values (@var1),(@var2)
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
ROLLBACK;
| Thread |
|---|
| • bk commit into 5.1 tree (lars:1.1855) | lars | 8 Apr |
