Commit c75e3d7e authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl


mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
sql/log_event.h:
  Auto merged
mysql-test/r/binlog_row_binlog.result:
  Manual merge
sql/log_event.cc:
  Manual merge
sql/sql_class.cc:
  Manual merge
parents 4268313e a2f9bcea

mysql-test/extra/binlog_tests/binlog.test

+4 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ commit; 
# first COMMIT must be Query_log_event, second - Xid_log_event

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;

drop table t1,t2;



#
@@ -44,10 +44,10 @@ commit; 
drop table t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events in 'master-bin.000001' from 102;

show binlog events in 'master-bin.000001' from 105;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events in 'master-bin.000002' from 102;

show binlog events in 'master-bin.000002' from 105;



# Test of a too big SET INSERT_ID: see if the truncated value goes

# into binlog (right), or the too big value (wrong); we look at the
@@ -82,7 +82,7 @@ DELETE FROM user WHERE host='localhost' AND user='@#@'; 
use test;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;

drop table t1,t2,t3,tt1;



-- source extra/binlog_tests/binlog_insert_delayed.test

mysql-test/extra/binlog_tests/binlog_insert_delayed.test

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ inc $count; 
# the way

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

show binlog events from 105;



insert delayed into t1 values (null),(null),(null),(null);

inc $count; inc $count; inc $count; inc $count;

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ SET @var1= x'8300'; 
EXECUTE stmt1 USING @var1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

SHOW BINLOG EVENTS FROM 102;

SHOW BINLOG EVENTS FROM 105;

SELECT HEX(f1) FROM t1;

DROP table t1;

# end test for bug#11338

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ set @v=convert('abc' using ucs2); 
reset master;

insert into t2 values (@v);

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

show binlog events from 105;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be

# escaped).

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

+14 −14
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ commit; 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



delete from t1;

delete from t2;
@@ -45,7 +45,7 @@ rollback; 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



delete from t1;

delete from t2;
@@ -61,7 +61,7 @@ commit; 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



delete from t1;

delete from t2;
@@ -79,7 +79,7 @@ select a from t1 order by a; # check that savepoints work :) 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



# and when ROLLBACK is not explicit?

delete from t1;
@@ -101,7 +101,7 @@ connection con2; 
select get_lock("a",10);

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



# and when not in a transact1on?

delete from t1;
@@ -113,7 +113,7 @@ insert into t2 select * from t1; 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



# Check that when the query updat1ng the MyISAM table is the first in the

# transaction, we log it immediately.
@@ -126,13 +126,13 @@ begin; 
insert into t2 select * from t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;

insert into t1 values(11);

commit;



--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;





# Check that things work like before this BEGIN/ROLLBACK code was added,
@@ -151,7 +151,7 @@ commit; 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



delete from t1;

delete from t2;
@@ -164,7 +164,7 @@ rollback; 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



delete from t1;

delete from t2;
@@ -180,7 +180,7 @@ commit; 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



delete from t1;

delete from t2;
@@ -198,7 +198,7 @@ select a from t1 order by a; # check that savepoints work :) 


--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



# Test for BUG#5714, where a MyISAM update in the transaction used to

# release row-level locks in InnoDB
@@ -259,7 +259,7 @@ connection con3; 
select get_lock("lock1",60);

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;

do release_lock("lock1");

drop table t0,t2;
@@ -326,7 +326,7 @@ SELECT * from t2; 
DROP TABLE t1,t2;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events from 102;

show binlog events from 105;



# Test for BUG#16559 (ROLLBACK should always have a zero error code in

# binlog). Has to be here and not earlier, as the SELECTs influence