Commit 564a94da authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.1-release 

into  mysql.com:/home/bk/b17400-mysql-5.1-new


sql/log_event.cc:
  Auto merged
parents 70707f50 8b17d33d

mysql-test/r/rpl_bit_npk.result

+36 −32
Original line number Diff line number Diff line
@@ -56,86 +56,90 @@ INSERT INTO test.t1 VALUES (8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,4 
UNLOCK TABLES;

UPDATE test.t1 set x034 = 50 where bit3 = b'000000';

UPDATE test.t1 set VNotSupp = 33 where bit1 = b'0';

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1;

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034

FROM test.t1

ORDER BY oSupp, sSuppD, GSuppDf, VNotSupp, x034;

oSupp	sSuppD	GSuppDf	VNotSupp	x034

5	5	3	NULL	1

5	5	3	2	1

5	5	3	33	1

5	5	3	2	50

5	5	3	33	1

5	5	3	33	1

5	5	3	33	1

5	5	3	33	1

SELECT hex(bit1) from test.t1;

5	5	3	33	1

SELECT hex(bit1) from test.t1 ORDER BY bit1;

hex(bit1)

3F

3F

0

2A

0

0

0

0

SELECT hex(bit2) from test.t1;

hex(bit2)

3E

0

2A

3F

3F

SELECT hex(bit2) from test.t1 ORDER BY bit2;

hex(bit2)

0

1

1

1

1

SELECT hex(bit3) from test.t1;

2A

3E

3F

SELECT hex(bit3) from test.t1 ORDER BY bit3;

hex(bit3)

35

24

15

0

1

1

1

1

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1;

15

24

35

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034

FROM test.t1

ORDER BY oSupp, sSuppD, GSuppDf, VNotSupp, x034;

oSupp	sSuppD	GSuppDf	VNotSupp	x034

5	5	3	NULL	1

5	5	3	2	1

5	5	3	33	1

5	5	3	2	50

5	5	3	33	1

5	5	3	33	1

5	5	3	33	1

5	5	3	33	1

SELECT hex(bit1) from test.t1;

5	5	3	33	1

SELECT hex(bit1) from test.t1 ORDER BY bit1;

hex(bit1)

3F

3F

0

2A

0

0

0

0

SELECT hex(bit2) from test.t1;

hex(bit2)

3E

0

2A

3F

3F

SELECT hex(bit2) from test.t1 ORDER BY bit2;

hex(bit2)

0

1

1

1

1

SELECT hex(bit3) from test.t1;

2A

3E

3F

SELECT hex(bit3) from test.t1 ORDER BY bit3;

hex(bit3)

35

24

15

0

1

1

1

1

15

24

35

CREATE TABLE test.t2 (a INT, b BIT(1));

INSERT INTO test.t2 VALUES (1, b'0');

INSERT INTO test.t2 VALUES (1, b'1');
@@ -144,19 +148,19 @@ CREATE TABLE test.t3 (a INT, b INT); 
INSERT INTO test.t3 VALUES (1, NULL);

INSERT INTO test.t3 VALUES (1, 0);

UPDATE test.t3 SET a = 2 WHERE b = 0;

SELECT a, hex(b) FROM test.t2;

SELECT a, hex(b) FROM test.t2 ORDER BY a,b;

a	hex(b)

1	0

2	1

SELECT * FROM test.t3;

SELECT * FROM test.t3 ORDER BY a,b;

a	b

1	NULL

2	0

SELECT a, hex(b) FROM test.t2;

SELECT a, hex(b) FROM test.t2 ORDER BY a,b;

a	hex(b)

1	0

2	1

SELECT * FROM test.t3;

SELECT * FROM test.t3 ORDER BY a,b;

a	b

1	NULL

2	0

mysql-test/t/disabled.def

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ rpl_ndb_auto_inc : BUG#17086 2006-02-16 jmiller CR: auto_increment_incre 
rpl_ndb_commit_afterflush : BUG#19328 2006-05-04 tomas Slave timeout with COM_REGISTER_SLAVE error causing stop

rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD

rpl_ndb_ddl              : BUG#18946 result file needs update + test needs to checked

rpl_ndb_innodb2ndb       : BUG#17400 2006-04-19 tomas Cluster Replication: delete & update of rows in table without pk fails on slave.

rpl_ndb_innodb2ndb       : Bug #19710  	Cluster replication to partition table fails on DELETE FROM statement

rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ

rpl_ndb_myisam2ndb       : BUG#17400 2006-04-19 tomas Cluster Replication: delete & update of rows in table without pk fails on slave.

rpl_ndb_myisam2ndb       : Bug #19710  	Cluster replication to partition table fails on DELETE FROM statement

rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian

rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly

rpl_row_func003 	 : BUG#19074 2006-13-04 andrei  test failed

mysql-test/t/rpl_bit_npk.test

+16 −12
Original line number Diff line number Diff line
@@ -70,18 +70,22 @@ UNLOCK TABLES; 


UPDATE test.t1 set x034 = 50 where bit3 = b'000000';

UPDATE test.t1 set VNotSupp = 33 where bit1 = b'0';

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1;

SELECT hex(bit1) from test.t1;

SELECT hex(bit2) from test.t1;

SELECT hex(bit3) from test.t1;

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034

    FROM test.t1

    ORDER BY oSupp, sSuppD, GSuppDf, VNotSupp, x034;

SELECT hex(bit1) from test.t1 ORDER BY bit1;

SELECT hex(bit2) from test.t1 ORDER BY bit2;

SELECT hex(bit3) from test.t1 ORDER BY bit3;

save_master_pos;



connection slave;

sync_with_master;

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034 FROM test.t1;

SELECT hex(bit1) from test.t1;

SELECT hex(bit2) from test.t1;

SELECT hex(bit3) from test.t1;

SELECT  oSupp, sSuppD, GSuppDf, VNotSupp, x034

    FROM test.t1

    ORDER BY oSupp, sSuppD, GSuppDf, VNotSupp, x034;

SELECT hex(bit1) from test.t1 ORDER BY bit1;

SELECT hex(bit2) from test.t1 ORDER BY bit2;

SELECT hex(bit3) from test.t1 ORDER BY bit3;



connection master;

CREATE TABLE test.t2 (a INT, b BIT(1));
@@ -94,14 +98,14 @@ INSERT INTO test.t3 VALUES (1, NULL); 
INSERT INTO test.t3 VALUES (1, 0);

UPDATE test.t3 SET a = 2 WHERE b = 0;



SELECT a, hex(b) FROM test.t2;

SELECT * FROM test.t3;

SELECT a, hex(b) FROM test.t2 ORDER BY a,b;

SELECT * FROM test.t3 ORDER BY a,b;

save_master_pos;



connection slave;

sync_with_master;

SELECT a, hex(b) FROM test.t2;

SELECT * FROM test.t3;

SELECT a, hex(b) FROM test.t2 ORDER BY a,b;

SELECT * FROM test.t3 ORDER BY a,b;



connection master;

DROP TABLE IF EXISTS test.t1;

mysql-test/t/rpl_ndb_innodb2ndb-slave.opt

+1 −1
Original line number Diff line number Diff line 
--binlog-format=row --default-storage-engine=ndb
 
--binlog-format=row --default-storage-engine=ndbcluster

mysql-test/t/rpl_ndb_myisam2ndb-slave.opt

+1 −1
Original line number Diff line number Diff line 
--default-storage-engine=ndb --binlog-format=row
 
--default-storage-engine=ndbcluster --binlog-format=row