| List: | Internals | « Previous MessageNext Message » | |
| From: | dlenev | Date: | March 15 2005 6:09pm |
| Subject: | bk commit into 5.0 tree (dlenev:1.1820) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 repository of dlenev. When dlenev 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.1820 05/03/15 20:09:24 dlenev@stripped +29 -0 More fixes after merging patch for WL#874 "Extended LOAD DATA" with current 5.0 sql/item_func.h 1.102 05/03/15 20:09:19 dlenev@stripped +1 -0 Yet another after merge fix. sql/item_func.cc 1.174 05/03/15 20:09:19 dlenev@stripped +7 -0 Yet another after merge fix. mysql-test/t/rpl_until.test 1.15 05/03/15 20:09:19 dlenev@stripped +4 -4 Yet another after merge fix. mysql-test/t/rpl_multi_query.test 1.5 05/03/15 20:09:19 dlenev@stripped +1 -1 Yet another after merge fix. mysql-test/t/rpl_loaddata.test 1.16 05/03/15 20:09:19 dlenev@stripped +1 -1 Yet another after merge fix. mysql-test/t/rpl_deadlock.test 1.3 05/03/15 20:09:19 dlenev@stripped +2 -2 Yet another after merge fix. mysql-test/t/mysqlbinlog.test 1.16 05/03/15 20:09:19 dlenev@stripped +2 -2 Yet another after merge fix. mysql-test/t/loaddata.test 1.9 05/03/15 20:09:19 dlenev@stripped +1 -1 Yet another after merge fix. mysql-test/r/user_var.result 1.29 05/03/15 20:09:19 dlenev@stripped +5 -5 Yet another after merge fix. mysql-test/r/rpl_user_variables.result 1.15 05/03/15 20:09:19 dlenev@stripped +28 -28 Yet another after merge fix. mysql-test/r/rpl_until.result 1.21 05/03/15 20:09:18 dlenev@stripped +16 -16 Yet another after merge fix. mysql-test/r/rpl_timezone.result 1.9 05/03/15 20:09:18 dlenev@stripped +7 -7 Yet another after merge fix. mysql-test/r/rpl_temporary.result 1.18 05/03/15 20:09:18 dlenev@stripped +13 -13 Yet another after merge fix. mysql-test/r/rpl_rotate_logs.result 1.67 05/03/15 20:09:18 dlenev@stripped +4 -4 Yet another after merge fix. mysql-test/r/rpl_reset_slave.result 1.14 05/03/15 20:09:18 dlenev@stripped +3 -3 Yet another after merge fix. mysql-test/r/rpl_replicate_do.result 1.29 05/03/15 20:09:18 dlenev@stripped +1 -1 Yet another after merge fix. mysql-test/r/rpl_relayrotate.result 1.17 05/03/15 20:09:18 dlenev@stripped +1 -1 Yet another after merge fix. mysql-test/r/rpl_multi_query.result 1.4 05/03/15 20:09:18 dlenev@stripped +1 -1 Yet another after merge fix. mysql-test/r/rpl_max_relay_size.result 1.20 05/03/15 20:09:18 dlenev@stripped +6 -6 Yet another after merge fix. mysql-test/r/rpl_log_pos.result 1.43 05/03/15 20:09:18 dlenev@stripped +4 -4 Yet another after merge fix. mysql-test/r/rpl_log.result 1.57 05/03/15 20:09:18 dlenev@stripped +51 -51 Yet another after merge fix. mysql-test/r/rpl_loaddata_rule_m.result 1.14 05/03/15 20:09:18 dlenev@stripped +2 -0 Yet another after merge fix. mysql-test/r/rpl_loaddata.result 1.28 05/03/15 20:09:18 dlenev@stripped +4 -4 Yet another after merge fix. mysql-test/r/rpl_flush_tables.result 1.12 05/03/15 20:09:18 dlenev@stripped +17 -17 Yet another after merge fix. mysql-test/r/rpl_flush_log_loop.result 1.23 05/03/15 20:09:18 dlenev@stripped +1 -1 Yet another after merge fix. mysql-test/r/rpl_error_ignored_table.result 1.20 05/03/15 20:09:18 dlenev@stripped +11 -11 Yet another after merge fix. mysql-test/r/rpl_deadlock.result 1.3 05/03/15 20:09:18 dlenev@stripped +5 -5 Yet another after merge fix. mysql-test/r/mix_innodb_myisam_binlog.result 1.21 05/03/15 20:09:18 dlenev@stripped +1 -1 Yet another after merge fix. client/mysqlbinlog.cc 1.110 05/03/15 20:09:18 dlenev@stripped +1 -1 Typo fix. # 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: dlenev # Host: brandersnatch.localdomain # Root: /home/dlenev/src/mysql-5.0-874 --- 1.173/sql/item_func.cc Tue Mar 15 11:53:52 2005 +++ 1.174/sql/item_func.cc Tue Mar 15 20:09:19 2005 @@ -3962,6 +3962,13 @@ } +my_decimal* Item_user_var_as_out_param::val_decimal(my_decimal *decimal_buffer) +{ + DBUG_ASSERT(0); + return 0; +} + + void Item_user_var_as_out_param::print(String *str) { str->append('@'); --- 1.101/sql/item_func.h Tue Mar 15 11:53:52 2005 +++ 1.102/sql/item_func.h Tue Mar 15 20:09:19 2005 @@ -1151,6 +1151,7 @@ double val_real(); longlong val_int(); String *val_str(String *str); + my_decimal *val_decimal(my_decimal *decimal_buffer); /* fix_fields() binds variable name with its entry structure */ bool fix_fields(THD *thd, struct st_table_list *tables, Item **ref); void print(String *str); --- 1.109/client/mysqlbinlog.cc Tue Mar 15 11:53:51 2005 +++ 1.110/client/mysqlbinlog.cc Tue Mar 15 20:09:18 2005 @@ -311,7 +311,7 @@ ptr= fname + target_dir_name_len; memcpy(ptr,bname,blen); ptr+= blen; - ptr+= my_sprintf(ptr,(ptr,"-%x",ce->file_id)); + ptr+= my_sprintf(ptr, (ptr, "-%x", file_id)); if ((file= create_unique_file(fname,ptr)) < 0) { --- 1.8/mysql-test/r/rpl_timezone.result Tue Mar 15 13:26:31 2005 +++ 1.9/mysql-test/r/rpl_timezone.result Tue Mar 15 20:09:18 2005 @@ -32,13 +32,13 @@ 2004-06-11 09:39:02 show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 96 Query 1 189 use `test`; create table t1 (t timestamp) -master-bin.000001 189 Query 1 281 use `test`; create table t2 (t char(32)) -master-bin.000001 281 Query 1 373 use `test`; SET ONE_SHOT TIME_ZONE='UTC' -master-bin.000001 373 Query 1 497 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') -master-bin.000001 497 Query 1 575 use `test`; delete from t1 -master-bin.000001 575 Query 1 699 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') +master-bin.000001 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 98 Query 1 191 use `test`; create table t1 (t timestamp) +master-bin.000001 191 Query 1 283 use `test`; create table t2 (t char(32)) +master-bin.000001 283 Query 1 375 use `test`; SET ONE_SHOT TIME_ZONE='UTC' +master-bin.000001 375 Query 1 499 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') +master-bin.000001 499 Query 1 577 use `test`; delete from t1 +master-bin.000001 577 Query 1 701 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') set time_zone='MET'; insert into t2 (select t from t1); select * from t1; --- 1.20/mysql-test/r/rpl_until.result Tue Mar 15 13:26:31 2005 +++ 1.21/mysql-test/r/rpl_until.result Tue Mar 15 20:09:18 2005 @@ -14,15 +14,15 @@ drop table t2; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 96 Query 1 218 use `test`; create table t1(n int not null auto_increment primary key) -master-bin.000001 218 Query 1 319 use `test`; insert into t1 values (1),(2),(3),(4) -master-bin.000001 319 Query 1 396 use `test`; drop table t1 -master-bin.000001 396 Query 1 518 use `test`; create table t2(n int not null auto_increment primary key) -master-bin.000001 518 Query 1 611 use `test`; insert into t2 values (1),(2) -master-bin.000001 611 Query 1 704 use `test`; insert into t2 values (3),(4) -master-bin.000001 704 Query 1 781 use `test`; drop table t2 -start slave until master_log_file='master-bin.000001', master_log_pos=304; +master-bin.000001 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key) +master-bin.000001 220 Query 1 321 use `test`; insert into t1 values (1),(2),(3),(4) +master-bin.000001 321 Query 1 398 use `test`; drop table t1 +master-bin.000001 398 Query 1 520 use `test`; create table t2(n int not null auto_increment primary key) +master-bin.000001 520 Query 1 613 use `test`; insert into t2 values (1),(2) +master-bin.000001 613 Query 1 706 use `test`; insert into t2 values (3),(4) +master-bin.000001 706 Query 1 783 use `test`; drop table t2 +start slave until master_log_file='master-bin.000001', master_log_pos=321; 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 781 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 319 # Master master-bin.000001 304 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 783 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 321 # Master master-bin.000001 321 No # start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; select * from t1; n @@ -41,21 +41,21 @@ 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 781 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 319 # Master master-no-such-bin.000001 291 No # -start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=710; +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 783 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 321 # Master master-no-such-bin.000001 291 No # +start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=751; 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 781 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 611 # Relay slave-relay-bin.000004 710 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 783 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 613 # Relay slave-relay-bin.000004 751 No # start slave; stop slave; -start slave until master_log_file='master-bin.000001', master_log_pos=710; +start slave until master_log_file='master-bin.000001', master_log_pos=783; 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 781 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 781 # Master master-bin.000001 710 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 783 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 783 # Master master-bin.000001 783 No # start slave until master_log_file='master-bin', master_log_pos=561; ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12; @@ -67,6 +67,6 @@ start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561; ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL start slave sql_thread; -start slave until master_log_file='master-bin.000001', master_log_pos=710; +start slave until master_log_file='master-bin.000001', master_log_pos=783; Warnings: Note 1254 Slave is already running --- 1.15/mysql-test/t/mysqlbinlog.test Tue Mar 15 13:26:31 2005 +++ 1.16/mysql-test/t/mysqlbinlog.test Tue Mar 15 20:09:19 2005 @@ -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=225 $MYSQL_TEST_DIR/var/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=232 $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=225 --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=232 --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.14/mysql-test/t/rpl_until.test Tue Mar 15 11:30:32 2005 +++ 1.15/mysql-test/t/rpl_until.test Tue Mar 15 20:09:19 2005 @@ -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=306; +start slave until master_log_file='master-bin.000001', master_log_pos=321; sleep 2; # here table should be still not deleted select * from t1; @@ -42,7 +42,7 @@ show slave status; # try replicate all until second insert to t2; -start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=712; +start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=751; sleep 4; select * from t2; --replace_result $MASTER_MYPORT MASTER_MYPORT @@ -58,7 +58,7 @@ stop slave; # this should stop immediately as we are already there -start slave until master_log_file='master-bin.000001', master_log_pos=733; +start slave until master_log_file='master-bin.000001', master_log_pos=783; # 2 is not enough when running with valgrind real_sleep 4 # here the sql slave thread should be stopped @@ -79,4 +79,4 @@ start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561; # Warning should be given for second command start slave sql_thread; -start slave until master_log_file='master-bin.000001', master_log_pos=733; +start slave until master_log_file='master-bin.000001', master_log_pos=783; --- 1.14/mysql-test/r/rpl_user_variables.result Tue Mar 15 13:26:31 2005 +++ 1.15/mysql-test/r/rpl_user_variables.result Tue Mar 15 20:09:19 2005 @@ -78,33 +78,33 @@ NULL show binlog events from 98; Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000001 96 Query 1 187 use `test`; create table t1(n char(30)) -slave-bin.000001 187 User var 2 230 @`i1`=12345678901234 -slave-bin.000001 230 User var 2 273 @`i2`=-12345678901234 -slave-bin.000001 273 User var 2 316 @`i3`=0 -slave-bin.000001 316 User var 2 359 @`i4`=-1 -slave-bin.000001 359 Query 1 471 use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4) -slave-bin.000001 471 User var 2 510 @`r1`=12.5 -slave-bin.000001 510 User var 2 549 @`r2`=-12.5 -slave-bin.000001 549 Query 1 647 use `test`; insert into t1 values (@r1), (@r2) -slave-bin.000001 647 User var 2 696 @`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci -slave-bin.000001 696 User var 2 731 @`s2`=_latin1 "" COLLATE latin1_swedish_ci -slave-bin.000001 731 User var 2 773 @`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci -slave-bin.000001 773 User var 2 815 @`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci -slave-bin.000001 815 User var 2 857 @`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci -slave-bin.000001 857 Query 1 976 use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5) -slave-bin.000001 976 User var 2 1002 @`n1`=NULL -slave-bin.000001 1002 Query 1 1093 use `test`; insert into t1 values (@n1) -slave-bin.000001 1093 User var 2 1119 @`n2`=NULL -slave-bin.000001 1119 Query 1 1210 use `test`; insert into t1 values (@n2) -slave-bin.000001 1210 Query 1 1327 use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1) -slave-bin.000001 1327 User var 2 1369 @`a`=2 -slave-bin.000001 1369 Query 1 1470 use `test`; insert into t1 values (@a+(@b:=@a+1)) -slave-bin.000001 1470 User var 2 1507 @`q`=_latin1 0x616263 COLLATE latin1_swedish_ci -slave-bin.000001 1507 Query 1 1640 use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2')) -slave-bin.000001 1640 User var 2 1682 @`a`=5 -slave-bin.000001 1682 Query 1 1777 use `test`; insert into t1 values (@a),(@a) -slave-bin.000001 1777 User var 2 1802 @`a`=NULL -slave-bin.000001 1802 Query 1 1904 use `test`; insert into t1 values (@a),(@a),(@a*5) +slave-bin.000001 98 Query 1 189 use `test`; create table t1(n char(30)) +slave-bin.000001 189 User var 2 232 @`i1`=12345678901234 +slave-bin.000001 232 User var 2 275 @`i2`=-12345678901234 +slave-bin.000001 275 User var 2 318 @`i3`=0 +slave-bin.000001 318 User var 2 361 @`i4`=-1 +slave-bin.000001 361 Query 1 473 use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4) +slave-bin.000001 473 User var 2 512 @`r1`=12.5 +slave-bin.000001 512 User var 2 551 @`r2`=-12.5 +slave-bin.000001 551 Query 1 649 use `test`; insert into t1 values (@r1), (@r2) +slave-bin.000001 649 User var 2 698 @`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci +slave-bin.000001 698 User var 2 733 @`s2`=_latin1 "" COLLATE latin1_swedish_ci +slave-bin.000001 733 User var 2 775 @`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci +slave-bin.000001 775 User var 2 817 @`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci +slave-bin.000001 817 User var 2 859 @`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci +slave-bin.000001 859 Query 1 978 use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5) +slave-bin.000001 978 User var 2 1004 @`n1`=NULL +slave-bin.000001 1004 Query 1 1095 use `test`; insert into t1 values (@n1) +slave-bin.000001 1095 User var 2 1121 @`n2`=NULL +slave-bin.000001 1121 Query 1 1212 use `test`; insert into t1 values (@n2) +slave-bin.000001 1212 Query 1 1329 use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1) +slave-bin.000001 1329 User var 2 1371 @`a`=2 +slave-bin.000001 1371 Query 1 1472 use `test`; insert into t1 values (@a+(@b:=@a+1)) +slave-bin.000001 1472 User var 2 1509 @`q`=_latin1 0x616263 COLLATE latin1_swedish_ci +slave-bin.000001 1509 Query 1 1642 use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2')) +slave-bin.000001 1642 User var 2 1684 @`a`=5 +slave-bin.000001 1684 Query 1 1779 use `test`; insert into t1 values (@a),(@a) +slave-bin.000001 1779 User var 2 1804 @`a`=NULL +slave-bin.000001 1804 Query 1 1906 use `test`; insert into t1 values (@a),(@a),(@a*5) drop table t1; stop slave; --- 1.20/mysql-test/r/mix_innodb_myisam_binlog.result Tue Mar 15 13:26:31 2005 +++ 1.21/mysql-test/r/mix_innodb_myisam_binlog.result Tue Mar 15 20:09:18 2005 @@ -92,7 +92,7 @@ master-bin.000001 98 Query 1 # use `test`; BEGIN master-bin.000001 167 Query 1 # use `test`; insert into t1 values(8) master-bin.000001 255 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 351 Query 1 # use `test`; ROLLBACK +master-bin.000001 350 Query 1 # use `test`; ROLLBACK delete from t1; delete from t2; reset master; --- 1.2/mysql-test/r/rpl_deadlock.result Wed Mar 2 19:52:26 2005 +++ 1.3/mysql-test/r/rpl_deadlock.result Tue Mar 15 20:09:18 2005 @@ -39,9 +39,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 19116 # # master-bin.000001 Yes Yes 0 0 19116 # None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19118 # # master-bin.000001 Yes Yes 0 0 19118 # None 0 No # stop slave; -change master to master_log_pos=534; +change master to master_log_pos=536; begin; select * from t2 for update; a @@ -57,10 +57,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 19116 # # master-bin.000001 Yes Yes 0 0 19116 # None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19118 # # master-bin.000001 Yes Yes 0 0 19118 # None 0 No # set global max_relay_log_size=0; stop slave; -change master to master_log_pos=534; +change master to master_log_pos=536; begin; select * from t2 for update; a @@ -77,5 +77,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 19116 # # master-bin.000001 Yes Yes 0 0 19116 # None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19118 # # master-bin.000001 Yes Yes 0 0 19118 # None 0 No # drop table t1,t2; --- 1.19/mysql-test/r/rpl_error_ignored_table.result Tue Mar 15 13:26:31 2005 +++ 1.20/mysql-test/r/rpl_error_ignored_table.result Tue Mar 15 20:09:18 2005 @@ -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 288 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 288 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 290 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 290 # None 0 No # show tables like 't1'; Tables_in_test (t1) drop table t1; @@ -26,14 +26,14 @@ 0 kill @id; drop table t2,t3; -show binlog events from 96; +show binlog events from 98; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 96 Query 1 195 use `test`; create table t1 (a int primary key) -master-bin.000001 195 Query 1 288 use `test`; insert into t1 values (1),(1) -master-bin.000001 288 Query 1 365 use `test`; drop table t1 -master-bin.000001 365 Query 1 464 use `test`; create table t2 (a int primary key) -master-bin.000001 464 Query 1 552 use `test`; insert into t2 values(1) -master-bin.000001 552 Query 1 640 use `test`; create table t3 (id int) -master-bin.000001 640 Query 1 742 use `test`; insert into t3 values(connection_id()) -master-bin.000001 742 Query 1 862 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10) -master-bin.000001 862 Query 1 942 use `test`; drop table t2,t3 +master-bin.000001 98 Query 1 197 use `test`; create table t1 (a int primary key) +master-bin.000001 197 Query 1 290 use `test`; insert into t1 values (1),(1) +master-bin.000001 290 Query 1 367 use `test`; drop table t1 +master-bin.000001 367 Query 1 466 use `test`; create table t2 (a int primary key) +master-bin.000001 466 Query 1 554 use `test`; insert into t2 values(1) +master-bin.000001 554 Query 1 642 use `test`; create table t3 (id int) +master-bin.000001 642 Query 1 744 use `test`; insert into t3 values(connection_id()) +master-bin.000001 744 Query 1 864 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10) +master-bin.000001 864 Query 1 944 use `test`; drop table t2,t3 --- 1.11/mysql-test/r/rpl_flush_tables.result Tue Mar 15 13:26:31 2005 +++ 1.12/mysql-test/r/rpl_flush_tables.result Tue Mar 15 20:09:18 2005 @@ -14,27 +14,27 @@ flush no_write_to_binlog tables; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 96 Server ver: SERVER_VERSION, Binlog ver: 4 -master-bin.000001 96 Query 1 183 use `test`; create table t1 (a int) -master-bin.000001 183 Query 1 273 use `test`; insert into t1 values (10) -master-bin.000001 273 Query 1 360 use `test`; create table t2 (a int) -master-bin.000001 360 Query 1 470 use `test`; create table t3 (a int) engine=merge union(t1) -master-bin.000001 470 Query 1 557 use `test`; create table t4 (a int) -master-bin.000001 557 Query 1 652 use `test`; insert into t4 select * from t3 -master-bin.000001 652 Query 1 747 use `test`; rename table t1 to t5, t2 to t1 +master-bin.000001 4 Format_desc 1 98 Server ver: SERVER_VERSION, Binlog ver: 4 +master-bin.000001 98 Query 1 185 use `test`; create table t1 (a int) +master-bin.000001 185 Query 1 275 use `test`; insert into t1 values (10) +master-bin.000001 275 Query 1 362 use `test`; create table t2 (a int) +master-bin.000001 362 Query 1 472 use `test`; create table t3 (a int) engine=merge union(t1) +master-bin.000001 472 Query 1 559 use `test`; create table t4 (a int) +master-bin.000001 559 Query 1 654 use `test`; insert into t4 select * from t3 +master-bin.000001 654 Query 1 749 use `test`; rename table t1 to t5, t2 to t1 select * from t3; a flush tables; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 96 Server ver: SERVER_VERSION, Binlog ver: 4 -master-bin.000001 96 Query 1 183 use `test`; create table t1 (a int) -master-bin.000001 183 Query 1 273 use `test`; insert into t1 values (10) -master-bin.000001 273 Query 1 360 use `test`; create table t2 (a int) -master-bin.000001 360 Query 1 470 use `test`; create table t3 (a int) engine=merge union(t1) -master-bin.000001 470 Query 1 557 use `test`; create table t4 (a int) -master-bin.000001 557 Query 1 652 use `test`; insert into t4 select * from t3 -master-bin.000001 652 Query 1 747 use `test`; rename table t1 to t5, t2 to t1 -master-bin.000001 747 Query 1 823 use `test`; flush tables +master-bin.000001 4 Format_desc 1 98 Server ver: SERVER_VERSION, Binlog ver: 4 +master-bin.000001 98 Query 1 185 use `test`; create table t1 (a int) +master-bin.000001 185 Query 1 275 use `test`; insert into t1 values (10) +master-bin.000001 275 Query 1 362 use `test`; create table t2 (a int) +master-bin.000001 362 Query 1 472 use `test`; create table t3 (a int) engine=merge union(t1) +master-bin.000001 472 Query 1 559 use `test`; create table t4 (a int) +master-bin.000001 559 Query 1 654 use `test`; insert into t4 select * from t3 +master-bin.000001 654 Query 1 749 use `test`; rename table t1 to t5, t2 to t1 +master-bin.000001 749 Query 1 825 use `test`; flush tables select * from t3; a --- 1.13/mysql-test/r/rpl_loaddata_rule_m.result Tue Mar 15 13:26:31 2005 +++ 1.14/mysql-test/r/rpl_loaddata_rule_m.result Tue Mar 15 20:09:18 2005 @@ -14,4 +14,6 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 98 Query 1 200 drop database if exists mysqltest master-bin.000001 200 Query 1 294 create database mysqltest +master-bin.000001 294 Begin_load_query 1 329 ;file_id=1;block_len=12 +master-bin.000001 329 Execute_load_query 1 480 use `mysqltest`; load data infile '../../std_data/rpl_loaddata.dat' into table test.t1 ;file_id=1 drop database mysqltest; --- 1.19/mysql-test/r/rpl_max_relay_size.result Tue Mar 15 13:26:31 2005 +++ 1.20/mysql-test/r/rpl_max_relay_size.result Tue Mar 15 20:09:18 2005 @@ -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 73752 # # master-bin.000001 Yes Yes 0 0 73752 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # 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 73752 # # master-bin.000001 Yes Yes 0 0 73752 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # 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 73752 # # master-bin.000001 Yes Yes 0 0 73752 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # None 0 No # stop slave; reset slave; flush logs; @@ -49,13 +49,13 @@ 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 73839 # # master-bin.000001 Yes Yes 0 0 73839 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73841 # # master-bin.000001 Yes Yes 0 0 73841 # 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 73916 # # master-bin.000001 Yes Yes 0 0 73916 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73918 # # master-bin.000001 Yes Yes 0 0 73918 # None 0 No # flush logs; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000002 96 +master-bin.000002 98 --- 1.3/mysql-test/r/rpl_multi_query.result Fri Feb 18 16:53:16 2005 +++ 1.4/mysql-test/r/rpl_multi_query.result Tue Mar 15 20:09:18 2005 @@ -19,7 +19,7 @@ 3 4 5 -show binlog events from 96; +show binlog events from 98; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # drop database if exists mysqltest master-bin.000001 # Query 1 # create database mysqltest --- 1.16/mysql-test/r/rpl_relayrotate.result Tue Mar 15 13:26:31 2005 +++ 1.17/mysql-test/r/rpl_relayrotate.result Tue Mar 15 20:09:18 2005 @@ -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 743186 # # master-bin.000001 Yes Yes 0 0 743186 # None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 743188 # # master-bin.000001 Yes Yes 0 0 743188 # None 0 No # drop table t1; --- 1.13/mysql-test/r/rpl_reset_slave.result Tue Mar 15 13:26:31 2005 +++ 1.14/mysql-test/r/rpl_reset_slave.result Tue Mar 15 20:09:18 2005 @@ -6,12 +6,12 @@ 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 96 # # master-bin.000001 Yes Yes 0 0 96 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # 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 96 # # master-bin.000001 No No 0 0 96 # None 0 No # +# 127.0.0.1 test MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 No No 0 0 98 # 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 @@ -19,7 +19,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 96 # # master-bin.000001 Yes Yes 0 0 96 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No # stop slave; reset slave; start slave; --- 1.2/mysql-test/t/rpl_deadlock.test Wed Mar 2 19:52:26 2005 +++ 1.3/mysql-test/t/rpl_deadlock.test Tue Mar 15 20:09:19 2005 @@ -68,7 +68,7 @@ # 2) Test lock wait timeout stop slave; -change master to master_log_pos=534; # 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; @@ -89,7 +89,7 @@ # This is really copy-paste of 2) of above stop slave; -change master to master_log_pos=534; +change master to master_log_pos=536; begin; select * from t2 for update; start slave; --- 1.4/mysql-test/t/rpl_multi_query.test Fri Feb 18 16:53:16 2005 +++ 1.5/mysql-test/t/rpl_multi_query.test Tue Mar 15 20:09:19 2005 @@ -24,6 +24,6 @@ select * from mysqltest.t1; connection master; --replace_column 2 # 5 # -show binlog events from 96; +show binlog events from 98; drop database mysqltest; sync_slave_with_master; --- 1.22/mysql-test/r/rpl_flush_log_loop.result Tue Mar 15 13:26:31 2005 +++ 1.23/mysql-test/r/rpl_flush_log_loop.result Tue Mar 15 20:09:18 2005 @@ -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 208 # # slave-bin.000001 Yes Yes 0 0 208 # None 0 No # +# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 209 # # slave-bin.000001 Yes Yes 0 0 209 # None 0 No # --- 1.27/mysql-test/r/rpl_loaddata.result Tue Mar 15 13:26:31 2005 +++ 1.28/mysql-test/r/rpl_loaddata.result Tue Mar 15 20:09:18 2005 @@ -22,7 +22,7 @@ 2003-03-22 2416 a bbbbb show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -slave-bin.000001 1097 +slave-bin.000001 1292 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 1560 # # master-bin.000001 Yes Yes 0 0 1560 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1800 # # master-bin.000001 Yes Yes 0 0 1800 # 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 1668 # # master-bin.000001 No No 0 0 1668 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1835 # # master-bin.000001 No No 0 0 1835 # None 0 No # set global sql_slave_skip_counter=1; start slave; set sql_log_bin=0; @@ -64,5 +64,5 @@ ERROR 23000: Duplicate entry '2003-03-22' for key 1 show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 537 +master-bin.000001 441 drop table t2; --- 1.15/mysql-test/t/rpl_loaddata.test Tue Mar 15 11:30:32 2005 +++ 1.16/mysql-test/t/rpl_loaddata.test Tue Mar 15 20:09:19 2005 @@ -36,7 +36,7 @@ # But we can't simply read this binlog, because as the slave has not been # restarted for this test, the file_id is uncertain (would cause test # failures). So instead, we test if the binlog looks long enough to -# contain LOAD DATA. Since 5.0.3 we assume that binlog of 1249 is ok. +# contain LOAD DATA. Since 5.0.3 we assume that binlog of 1292 is ok. # If LOAD DATA was not logged, the binlog would be shorter. show master status; --- 1.8/mysql-test/t/loaddata.test Tue Mar 15 11:30:32 2005 +++ 1.9/mysql-test/t/loaddata.test Tue Mar 15 20:09:19 2005 @@ -61,6 +61,6 @@ load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c)); select * from t1; # and this should bark ---error 1400 +--error 1409 load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b); drop table t1; --- 1.28/mysql-test/r/rpl_replicate_do.result Tue Mar 15 13:26:31 2005 +++ 1.29/mysql-test/r/rpl_replicate_do.result Tue Mar 15 20:09:18 2005 @@ -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 1618 # # master-bin.000001 Yes Yes test.t1 0 0 1618 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1668 # # master-bin.000001 Yes Yes test.t1 0 0 1668 # None 0 No # --- 1.42/mysql-test/r/rpl_log_pos.result Tue Mar 15 13:26:31 2005 +++ 1.43/mysql-test/r/rpl_log_pos.result Tue Mar 15 20:09:18 2005 @@ -6,10 +6,10 @@ start slave; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 96 +master-bin.000001 98 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 96 # # master-bin.000001 Yes Yes 0 0 96 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No # stop slave; change master to master_log_pos=73; start slave; @@ -30,13 +30,13 @@ # 127.0.0.1 root MASTER_PORT 1 master-bin.000001 173 # # master-bin.000001 No Yes 0 0 173 # None 0 No # show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 96 +master-bin.000001 98 create table if not exists t1 (n int); drop table if exists t1; create table t1 (n int); insert into t1 values (1),(2),(3); stop slave; -change master to master_log_pos=96; +change master to master_log_pos=98; start slave; select * from t1; n --- 1.66/mysql-test/r/rpl_rotate_logs.result Tue Mar 15 13:26:31 2005 +++ 1.67/mysql-test/r/rpl_rotate_logs.result Tue Mar 15 20:09:18 2005 @@ -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 550 # # master-bin.000001 Yes Yes 0 0 550 # 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 498 # # master-bin.000003 Yes Yes 0 0 498 # 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 2051 +master-bin.000005 2146 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 2051 # # master-bin.000005 Yes Yes 0 0 2051 # None 0 No # +# 127.0.0.1 root MASTER_PORT 60 master-bin.000005 2146 # # master-bin.000005 Yes Yes 0 0 2146 # None 0 No # lock tables t3 read; select count(*) from t3 where n >= 4; count(*) --- 1.56/mysql-test/r/rpl_log.result Tue Mar 15 13:26:31 2005 +++ 1.57/mysql-test/r/rpl_log.result Tue Mar 15 20:09:18 2005 @@ -19,25 +19,25 @@ drop table t1; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 96 Query 1 218 use `test`; create table t1(n int not null auto_increment primary key) -master-bin.000001 218 Intvar 1 246 INSERT_ID=1 -master-bin.000001 246 Query 1 338 use `test`; insert into t1 values (NULL) -master-bin.000001 338 Query 1 415 use `test`; drop table t1 -master-bin.000001 415 Query 1 519 use `test`; create table t1 (word char(20) not null) -master-bin.000001 519 Create_file 1 1189 db=test;table=t1;file_id=1;block_len=581 -master-bin.000001 1189 Exec_load 1 1212 ;file_id=1 -master-bin.000001 1212 Query 1 1289 use `test`; drop table t1 -show binlog events from 96 limit 1; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 96 Query 1 218 use `test`; create table t1(n int not null auto_increment primary key) -show binlog events from 96 limit 2; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 96 Query 1 218 use `test`; create table t1(n int not null auto_increment primary key) -master-bin.000001 218 Intvar 1 246 INSERT_ID=1 -show binlog events from 96 limit 2,1; +master-bin.000001 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key) +master-bin.000001 220 Intvar 1 248 INSERT_ID=1 +master-bin.000001 248 Query 1 340 use `test`; insert into t1 values (NULL) +master-bin.000001 340 Query 1 417 use `test`; drop table t1 +master-bin.000001 417 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 1274 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1 +master-bin.000001 1274 Query 1 1351 use `test`; drop table t1 +show binlog events from 98 limit 1; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key) +show binlog events from 98 limit 2; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key) +master-bin.000001 220 Intvar 1 248 INSERT_ID=1 +show binlog events from 98 limit 2,1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 246 Query 1 338 use `test`; insert into t1 values (NULL) +master-bin.000001 248 Query 1 340 use `test`; insert into t1 values (NULL) flush logs; create table t5 (a int); drop table t5; @@ -49,24 +49,24 @@ drop table t1; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 96 Query 1 218 use `test`; create table t1(n int not null auto_increment primary key) -master-bin.000001 218 Intvar 1 246 INSERT_ID=1 -master-bin.000001 246 Query 1 338 use `test`; insert into t1 values (NULL) -master-bin.000001 338 Query 1 415 use `test`; drop table t1 -master-bin.000001 415 Query 1 519 use `test`; create table t1 (word char(20) not null) -master-bin.000001 519 Create_file 1 1189 db=test;table=t1;file_id=1;block_len=581 -master-bin.000001 1189 Exec_load 1 1212 ;file_id=1 -master-bin.000001 1212 Query 1 1289 use `test`; drop table t1 -master-bin.000001 1289 Rotate 1 1333 master-bin.000002;pos=4 +master-bin.000001 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key) +master-bin.000001 220 Intvar 1 248 INSERT_ID=1 +master-bin.000001 248 Query 1 340 use `test`; insert into t1 values (NULL) +master-bin.000001 340 Query 1 417 use `test`; drop table t1 +master-bin.000001 417 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 1274 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1 +master-bin.000001 1274 Query 1 1351 use `test`; drop table t1 +master-bin.000001 1351 Rotate 1 1395 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 96 Server ver: VERSION, Binlog ver: 4 -master-bin.000002 96 Query 1 183 use `test`; create table t5 (a int) -master-bin.000002 183 Query 1 260 use `test`; drop table t5 -master-bin.000002 260 Query 1 347 use `test`; create table t1 (n int) -master-bin.000002 347 Query 1 436 use `test`; insert into t1 values (1) -master-bin.000002 436 Query 1 513 use `test`; drop table t1 +master-bin.000002 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4 +master-bin.000002 98 Query 1 185 use `test`; create table t5 (a int) +master-bin.000002 185 Query 1 262 use `test`; drop table t5 +master-bin.000002 262 Query 1 349 use `test`; create table t1 (n int) +master-bin.000002 349 Query 1 438 use `test`; insert into t1 values (1) +master-bin.000002 438 Query 1 515 use `test`; drop table t1 show binary logs; Log_name master-bin.000001 @@ -78,26 +78,26 @@ slave-bin.000002 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 96 Server ver: VERSION, Binlog ver: 4 -slave-bin.000001 96 Query 1 218 use `test`; create table t1(n int not null auto_increment primary key) -slave-bin.000001 218 Intvar 1 246 INSERT_ID=1 -slave-bin.000001 246 Query 1 338 use `test`; insert into t1 values (NULL) -slave-bin.000001 338 Query 1 415 use `test`; drop table t1 -slave-bin.000001 415 Query 1 519 use `test`; create table t1 (word char(20) not null) -slave-bin.000001 519 Create_file 1 1198 db=test;table=t1;file_id=1;block_len=581 -slave-bin.000001 1198 Exec_load 1 1221 ;file_id=1 -slave-bin.000001 1221 Query 1 1298 use `test`; drop table t1 -slave-bin.000001 1298 Query 1 1385 use `test`; create table t5 (a int) -slave-bin.000001 1385 Query 1 1462 use `test`; drop table t5 -slave-bin.000001 1462 Rotate 2 1505 slave-bin.000002;pos=4 +slave-bin.000001 4 Format_desc 2 98 Server ver: VERSION, Binlog ver: 4 +slave-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key) +slave-bin.000001 220 Intvar 1 248 INSERT_ID=1 +slave-bin.000001 248 Query 1 340 use `test`; insert into t1 values (NULL) +slave-bin.000001 340 Query 1 417 use `test`; drop table t1 +slave-bin.000001 417 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 1283 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 1283 Query 1 1360 use `test`; drop table t1 +slave-bin.000001 1360 Query 1 1447 use `test`; create table t5 (a int) +slave-bin.000001 1447 Query 1 1524 use `test`; drop table t5 +slave-bin.000001 1524 Rotate 2 1567 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 96 Server ver: VERSION, Binlog ver: 4 -slave-bin.000002 96 Query 1 183 use `test`; create table t1 (n int) -slave-bin.000002 183 Query 1 272 use `test`; insert into t1 values (1) -slave-bin.000002 272 Query 1 349 use `test`; drop table t1 +slave-bin.000002 4 Format_desc 2 98 Server ver: VERSION, Binlog ver: 4 +slave-bin.000002 98 Query 1 185 use `test`; create table t1 (n int) +slave-bin.000002 185 Query 1 274 use `test`; insert into t1 values (1) +slave-bin.000002 274 Query 1 351 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 513 # # master-bin.000002 Yes Yes 0 0 513 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 515 # # master-bin.000002 Yes Yes 0 0 515 # 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.28/mysql-test/r/user_var.result Tue Mar 15 13:26:31 2005 +++ 1.29/mysql-test/r/user_var.result Tue Mar 15 20:09:19 2005 @@ -178,11 +178,11 @@ insert into t1 values (@var1),(@var2); show binlog events from 98; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 96 User var 1 137 @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci -master-bin.000001 137 Query 1 230 use `test`; INSERT INTO t1 VALUES(@`a b`) -master-bin.000001 230 User var 1 272 @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci -master-bin.000001 272 User var 1 310 @`var2`=_latin1 0x61 COLLATE latin1_swedish_ci -master-bin.000001 310 Query 1 411 use `test`; insert into t1 values (@var1),(@var2) +master-bin.000001 98 User var 1 139 @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci +master-bin.000001 139 Query 1 232 use `test`; INSERT INTO t1 VALUES(@`a b`) +master-bin.000001 232 User var 1 274 @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci +master-bin.000001 274 User var 1 312 @`var2`=_latin1 0x61 COLLATE latin1_swedish_ci +master-bin.000001 312 Query 1 413 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; --- 1.17/mysql-test/r/rpl_temporary.result Tue Mar 15 13:26:31 2005 +++ 1.18/mysql-test/r/rpl_temporary.result Tue Mar 15 20:09:18 2005 @@ -38,19 +38,19 @@ 7 show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 96 Query 1 186 use `test`; drop table if exists t1,t2 -master-bin.000001 186 Query 1 272 use `test`; create table t1(f int) -master-bin.000001 272 Query 1 358 use `test`; create table t2(f int) -master-bin.000001 358 Query 1 484 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10) -master-bin.000001 484 Query 1 580 use `test`; create temporary table t3(f int) -master-bin.000001 580 Query 1 685 use `test`; insert into t3 select * from t1 where f<6 -master-bin.000001 685 Query 1 781 use `test`; create temporary table t3(f int) -master-bin.000001 781 Query 1 883 use `test`; insert into t2 select count(*) from t3 -master-bin.000001 883 Query 1 989 use `test`; insert into t3 select * from t1 where f>=4 -master-bin.000001 989 Query 1 1076 use `test`; drop temporary table t3 -master-bin.000001 1076 Query 1 1178 use `test`; insert into t2 select count(*) from t3 -master-bin.000001 1178 Query 1 1265 use `test`; drop temporary table t3 +master-bin.000001 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 98 Query 1 188 use `test`; drop table if exists t1,t2 +master-bin.000001 188 Query 1 274 use `test`; create table t1(f int) +master-bin.000001 274 Query 1 360 use `test`; create table t2(f int) +master-bin.000001 360 Query 1 486 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10) +master-bin.000001 486 Query 1 582 use `test`; create temporary table t3(f int) +master-bin.000001 582 Query 1 687 use `test`; insert into t3 select * from t1 where f<6 +master-bin.000001 687 Query 1 783 use `test`; create temporary table t3(f int) +master-bin.000001 783 Query 1 885 use `test`; insert into t2 select count(*) from t3 +master-bin.000001 885 Query 1 991 use `test`; insert into t3 select * from t1 where f>=4 +master-bin.000001 991 Query 1 1078 use `test`; drop temporary table t3 +master-bin.000001 1078 Query 1 1180 use `test`; insert into t2 select count(*) from t3 +master-bin.000001 1180 Query 1 1267 use `test`; drop temporary table t3 drop table t1, t2; use test; SET TIMESTAMP=1040323920;
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (dlenev:1.1820) | dlenev | 15 Mar |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.846 sec. using MySQL 5.1.14-beta-log