Commit b38b9cae authored by unknown's avatar unknown
Browse files

Merge monty@192.168.0.9:/my/mysql-5.1 

into  mysql.com:/home/my/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
parents 79e3b534 b58e990c

mysql-test/include/have_binlog_format_mixed_or_row.inc

0 → 100644
+5 −0
Original line number Diff line number Diff line 
--require r/have_binlog_format_row.require

--disable_query_log

--replace_result MIXED ROW

show variables like "binlog_format";

--enable_query_log

mysql-test/r/rpl_truncate_7ndb_2.result

0 → 100644
+91 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

**** On Master ****

CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;

INSERT INTO t1 VALUES (1,1), (2,2);

SELECT * FROM t1 ORDER BY a,b;

a	b

1	1

2	2

**** On Slave ****

INSERT INTO t1 VALUE (3,3);

SELECT * FROM t1 ORDER BY a,b;

a	b

1	1

2	2

3	3

**** On Master ****

TRUNCATE TABLE t1;

SELECT * FROM t1 ORDER BY a,b;

a	b

**** On Slave ****

SELECT * FROM t1 ORDER BY a,b;

a	b

**** On Master ****

DROP TABLE t1;

SHOW BINLOG EVENTS;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	102	Server ver: SERVER_VERSION, Binlog ver: 4

master-bin.000001	102	Query	1	219	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB

master-bin.000001	219	Query	1	283	BEGIN

master-bin.000001	283	Table_map	1	40	table_id: # (test.t1)

master-bin.000001	323	Table_map	1	93	table_id: # (cluster.apply_status)

master-bin.000001	376	Write_rows	1	135	table_id: #

master-bin.000001	418	Write_rows	1	182	table_id: # flags: STMT_END_F

master-bin.000001	465	Query	1	530	COMMIT

master-bin.000001	530	Query	1	610	use `test`; TRUNCATE TABLE t1

master-bin.000001	610	Query	1	686	use `test`; DROP TABLE t1

**** On Master ****

CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;

INSERT INTO t1 VALUES (1,1), (2,2);

SELECT * FROM t1 ORDER BY a,b;

a	b

1	1

2	2

**** On Slave ****

INSERT INTO t1 VALUE (3,3);

SELECT * FROM t1 ORDER BY a,b;

a	b

1	1

2	2

3	3

**** On Master ****

DELETE FROM t1;

SELECT * FROM t1 ORDER BY a,b;

a	b

**** On Slave ****

SELECT * FROM t1 ORDER BY a,b;

a	b

3	3

**** On Master ****

DROP TABLE t1;

SHOW BINLOG EVENTS;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	102	Server ver: SERVER_VERSION, Binlog ver: 4

master-bin.000001	102	Query	1	219	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB

master-bin.000001	219	Query	1	283	BEGIN

master-bin.000001	283	Table_map	1	40	table_id: # (test.t1)

master-bin.000001	323	Table_map	1	93	table_id: # (cluster.apply_status)

master-bin.000001	376	Write_rows	1	135	table_id: #

master-bin.000001	418	Write_rows	1	182	table_id: # flags: STMT_END_F

master-bin.000001	465	Query	1	530	COMMIT

master-bin.000001	530	Query	1	610	use `test`; TRUNCATE TABLE t1

master-bin.000001	610	Query	1	686	use `test`; DROP TABLE t1

master-bin.000001	686	Query	1	803	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB

master-bin.000001	803	Query	1	867	BEGIN

master-bin.000001	867	Table_map	1	40	table_id: # (test.t1)

master-bin.000001	907	Table_map	1	93	table_id: # (cluster.apply_status)

master-bin.000001	960	Write_rows	1	135	table_id: #

master-bin.000001	1002	Write_rows	1	182	table_id: # flags: STMT_END_F

master-bin.000001	1049	Query	1	1114	COMMIT

master-bin.000001	1114	Query	1	1178	BEGIN

master-bin.000001	1178	Table_map	1	40	table_id: # (test.t1)

master-bin.000001	1218	Table_map	1	93	table_id: # (cluster.apply_status)

master-bin.000001	1271	Write_rows	1	135	table_id: #

master-bin.000001	1313	Delete_rows	1	174	table_id: # flags: STMT_END_F

master-bin.000001	1352	Query	1	1417	COMMIT

master-bin.000001	1417	Query	1	1493	use `test`; DROP TABLE t1

mysql-test/t/rpl_truncate_7ndb.test

+1 −0
Original line number Diff line number Diff line 


--source include/have_ndb.inc

--source include/master-slave.inc

--source include/have_binlog_format_mixed_or_row.inc



--disable_query_log

--disable_warnings

mysql-test/t/rpl_truncate_7ndb_2-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--binlog-format=mixed

mysql-test/t/rpl_truncate_7ndb_2.test

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# Same test as rpl_truncate_7ndb.test, but with mixed mode

# This is marked with 'big_test' just because the rpl_truncate_7ndb test is

# so slow...



--source include/big_test.inc

--source t/rpl_truncate_7ndb.test