Commit 45546f3d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/deleted/.del-rpl_heap.test:
  Auto merged
Makefile.am:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/r/binlog_stm_binlog.result:
  Auto merged
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
unittest/README.txt:
  Auto merged
unittest/unit.pl:
  Auto merged
mysql-test/t/disabled.def:
  Merge (main -> rpl 5.1)
parents a822d651 d4d01d59

Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ test-unit: 


test-ps:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=statement

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed



test-nr:

	cd mysql-test ; \
@@ -125,6 +125,10 @@ test-pr: 
	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row



test-ns:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed



test-binlog-statement:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement

mysql-test/extra/binlog_tests/binlog.test

+1 −21
Original line number Diff line number Diff line
@@ -59,24 +59,4 @@ insert into t1 values(null); 
select * from t1;

drop table t1;



# Test of binlogging of INSERT_ID with INSERT DELAYED

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

# First, avoid BUG#20627:

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

# Verify that only one INSERT_ID event is binlogged.

insert delayed into t1 values (207);



# We use sleeps between statements, that's the only way to get a

# repeatable binlog in a normal test run and under Valgrind.

# It may be that the "binlog missing rows" of BUG#20821 shows up

# here.

sleep 2;

insert delayed into t1 values (null);

sleep 2;

insert delayed into t1 values (300);

sleep 2; # time for the delayed queries to reach disk

select * from t1;

--replace_column 2 # 5 #

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

show binlog events from 102;

drop table t1;
 
-- source extra/binlog_tests/binlog_insert_delayed.test

mysql-test/extra/binlog_tests/binlog_insert_delayed.test

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# Test of binlogging of INSERT_ID with INSERT DELAYED

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

# First, avoid BUG#20627:

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

# Verify that only one INSERT_ID event is binlogged.

# Note, that because of WL#3368 mixed mode binlog records RBR events for the delayed

insert delayed into t1 values (207);



# We use sleeps between statements, that's the only way to get a

# repeatable binlog in a normal test run and under Valgrind.

# It may be that the "binlog missing rows" of BUG#20821 shows up

# here.

sleep 2;

insert delayed into t1 values (null);

sleep 2;

insert delayed into t1 values (300);

sleep 2; # time for the delayed queries to reach disk

select * from t1;

--replace_column 2 # 5 #

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

show binlog events from 102;

drop table t1;

mysql-test/extra/rpl_tests/rpl_loaddata.test

+1 −1
Original line number Diff line number Diff line 
# Requires statement logging

-- source include/have_binlog_format_statement.inc

-- source include/have_binlog_format_mixed_or_statement.inc



# See if replication of a "LOAD DATA in an autoincrement column"

# Honours autoincrement values

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

+82 −41
Original line number Diff line number Diff line
@@ -3,11 +3,23 @@ 


# Consider making these part of the basic RBR tests.



-- source include/have_binlog_format_row.inc

-- source include/master-slave.inc

connection master;

--disable_warnings

--disable_query_log

DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;

DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t9;

--enable_query_log

--enable_warnings

sync_slave_with_master;

STOP SLAVE;

SET GLOBAL SQL_MODE='STRICT_ALL_TABLES';

START SLAVE;



connection master;

eval CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t1_int (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t1_bit (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t1_char (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t1_nodef (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t3 (a INT PRIMARY KEY, b INT) ENGINE=$engine_type;

eval CREATE TABLE t4 (a INT) ENGINE=$engine_type;
@@ -15,15 +27,25 @@ eval CREATE TABLE t5 (a INT, b INT, c INT) ENGINE=$engine_type; 
eval CREATE TABLE t6 (a INT, b INT, c INT) ENGINE=$engine_type;



# Table used to detect that slave is running

eval CREATE TABLE t9 (a INT PRIMARY KEY) ENGINE=$engine_type;

eval CREATE TABLE t9 (a INT) ENGINE=$engine_type;



sync_slave_with_master;

# On the slave, we add one column last in table 't1',

ALTER TABLE t1 ADD x INT DEFAULT 42;

# ... add one column in the middle of table 't2', and

ALTER TABLE t2 ADD x INT DEFAULT 42 AFTER a;

# ... add one column first in table 't3'.

ALTER TABLE t3 ADD x INT DEFAULT 42 FIRST;



# On the slave, we add one INT column last in table 't1_int',

ALTER TABLE t1_int ADD x INT DEFAULT 42;

# ... and add BIT columns last in table 't1_bit' to ensure that we

# have at least one extra null byte on the slave,

ALTER TABLE t1_bit

  ADD x BIT(3) DEFAULT b'011',

  ADD y BIT(5) DEFAULT b'10101',

  ADD z BIT(2) DEFAULT b'10';

# ... and add one CHAR column last in table 't1_char',

ALTER TABLE t1_char ADD x CHAR(20) DEFAULT 'Just a test';

# ... and add one non-nullable INT column last in table 't1_text'

#     with no default,

ALTER TABLE t1_nodef ADD x INT NOT NULL;

# ... and remove the last column in t2

ALTER TABLE t2 DROP b;

# ... change the type of the single column in table 't4'

ALTER TABLE t4 MODIFY a FLOAT;

# ... change the type of the middle column of table 't5'
@@ -31,49 +53,70 @@ ALTER TABLE t5 MODIFY b FLOAT; 
# ... change the type of the last column of table 't6'

ALTER TABLE t6 MODIFY c FLOAT;



# Each of these should generate an error and stop the slave

# Insert some values for tables on slave side. These should not be

# modified when the row from the master is applied.

INSERT INTO t1_int  VALUES (2, 4, 4711);

INSERT INTO t1_char VALUES (2, 4, 'Foo is a bar');

INSERT INTO t1_bit  VALUES (2, 4, b'101', b'11100', b'01');



--echo **** On Master ****

connection master;

INSERT INTO t9 VALUES (1);

INSERT INTO t1_int VALUES (1,2);

INSERT INTO t1_int VALUES (2,5);

INSERT INTO t1_bit VALUES (1,2);

INSERT INTO t1_bit VALUES (2,5);

INSERT INTO t1_char VALUES (1,2);

INSERT INTO t1_char VALUES (2,5);

SELECT * FROM t1_int;

SELECT * FROM t1_bit;

SELECT * FROM t1_char;

--echo **** On Slave ****

sync_slave_with_master;

# Now slave is guaranteed to be running

SELECT a,b,x FROM t1_int;

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

SELECT a,b,x FROM t1_char;



--echo **** On Master ****

connection master;

INSERT INTO t1 VALUES (1,2);

connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

UPDATE t1_int  SET b=2*b WHERE a=2;

UPDATE t1_char SET b=2*b WHERE a=2;

UPDATE t1_bit  SET b=2*b WHERE a=2;

SELECT * FROM t1_int;

SELECT * FROM t1_bit;

SELECT * FROM t1_char;

--echo **** On Slave ****

sync_slave_with_master;

SELECT a,b,x FROM t1_int;

SELECT a,b,HEX(x),HEX(y),HEX(z) FROM t1_bit;

SELECT a,b,x FROM t1_char;



# Each of these should generate an error and stop the slave



connection master;

INSERT INTO t9 VALUES (2);

sync_slave_with_master;

# Now slave is guaranteed to be running

connection master;

INSERT INTO t2 VALUES (2,4);

INSERT INTO t1_nodef VALUES (1,2);

connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;



connection master;

INSERT INTO t9 VALUES (3);

INSERT INTO t9 VALUES (2);

sync_slave_with_master;

# Now slave is guaranteed to be running

connection master;

INSERT INTO t3 VALUES (3,6);

INSERT INTO t2 VALUES (2,4);

connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -86,9 +129,8 @@ INSERT INTO t4 VALUES (4); 
connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -101,9 +143,8 @@ INSERT INTO t5 VALUES (5,10,25); 
connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -116,14 +157,14 @@ INSERT INTO t6 VALUES (6,12,36); 
connection slave;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #

--vertical_results

SHOW SLAVE STATUS;

--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;



connection master;

--disable_warnings

DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t9;

DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;

DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t9;

--enable_warnings

sync_slave_with_master;