Commit d985e765 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new 

into  mysql.com:/home/bk/b17400-mysql-5.1-new
parents 58443d61 99d34d28

mysql-test/t/binlog_row_blackhole.test

+6 −0
Original line number Diff line number Diff line
@@ -2,4 +2,10 @@ 
# For both statement and row based bin logs 9/19/2005 [jbm]



-- source include/have_binlog_format_row.inc



# Bug#18326: Do not lock table for writing during prepare of statement

# The use of the ps protocol causes extra table maps in the binlog, so

# we disable the ps-protocol for this statement.

--disable_ps_protocol

-- source extra/binlog_tests/blackhole.test

--enable_ps_protocol

mysql-test/t/binlog_row_insert_select.test

+5 −0
Original line number Diff line number Diff line
@@ -2,4 +2,9 @@ 
# For both statement and row based bin logs 9/19/2005 [jbm]



-- source include/have_binlog_format_row.inc

# Bug#18326: Do not lock table for writing during prepare of statement

# The use of the ps protocol causes extra table maps in the binlog, so

# we disable the ps-protocol for this statement.

--disable_ps_protocol

-- source extra/binlog_tests/insert_select-binlog.test

--enable_ps_protocol

mysql-test/t/binlog_row_mix_innodb_myisam.test

+8 −0
Original line number Diff line number Diff line
@@ -2,8 +2,16 @@ 
# For both statement and row based bin logs 9/19/2005 [jbm]



-- source include/have_binlog_format_row.inc



# Bug#18326: Do not lock table for writing during prepare of statement

# The use of the ps protocol causes extra table maps in the binlog, so

# we disable the ps-protocol for this statement.

--disable_ps_protocol



-- source extra/binlog_tests/mix_innodb_myisam_binlog.test



--enable_ps_protocol



# This piece below cannot be put into

# extra/binlog_tests/mix_innodb_myisam_binlog.test

# because the argument of --start-position differs between statement-

mysql-test/t/rpl_row_create_table.test

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 
--source include/have_binlog_format_row.inc

--source include/master-slave.inc



# Bug#18326: Do not lock table for writing during prepare of statement

# The use of the ps protocol causes extra table maps in the binlog, so

# we disable the ps-protocol for this statement.

--disable_ps_protocol



--disable_query_log

--disable_warnings

DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9;
@@ -111,3 +116,4 @@ STOP SLAVE; 
SET GLOBAL storage_engine=@storage_engine;

START SLAVE;

--enable_query_log

--enable_ps_protocol

mysql-test/t/rpl_row_flsh_tbls.test

+6 −0
Original line number Diff line number Diff line
@@ -2,5 +2,11 @@ 
-- source include/have_binlog_format_row.inc



let $rename_event_pos= 615;



# Bug#18326: Do not lock table for writing during prepare of statement

# The use of the ps protocol causes extra table maps in the binlog, so

# we disable the ps-protocol for this statement.

--disable_ps_protocol

-- source extra/rpl_tests/rpl_flsh_tbls.test

--enable_ps_protocol