List:Commits« Previous MessageNext Message »
From:Martin Skold Date:June 2 2010 10:24am
Subject:bzr push into mysql-5.1-telco-6.3 branch (Martin.Skold:3208) Bug#34303
Bug#54155 Bug#54168
View as plain text  
 3208 Martin Skold	2010-06-02 [merge]
      Merge
      added:
        storage/ndb/include/portlib/ndb_socket_poller.h
      modified:
        mysql-test/t/ctype_cp932_binlog_stm.test
        storage/ndb/include/portlib/NdbTCP.h
        storage/ndb/include/transporter/TransporterRegistry.hpp
        storage/ndb/include/util/SocketClient.hpp
        storage/ndb/include/util/SocketServer.hpp
        storage/ndb/src/common/transporter/TCP_Transporter.cpp
        storage/ndb/src/common/transporter/TCP_Transporter.hpp
        storage/ndb/src/common/transporter/Transporter.cpp
        storage/ndb/src/common/transporter/TransporterRegistry.cpp
        storage/ndb/src/common/util/SocketClient.cpp
        storage/ndb/src/common/util/SocketServer.cpp
        storage/ndb/src/common/util/socket_io.cpp
        storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
        storage/ndb/src/kernel/vm/SimulatedBlock.cpp
        storage/ndb/src/kernel/vm/VMSignal.hpp
        storage/ndb/src/mgmapi/mgmapi.cpp

=== added file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_bitfield.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_bitfield.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_bitfield.result	2010-06-02 09:03:04 +0000
@@ -0,0 +1,85 @@
+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;
+create table t1 ( pk int not null auto_increment primary key, b0 bit(64) not null, b1 bit(64) not null, b2 bit(64) not null, b3
+bit(64) not null, b4 bit(64) not null, b5 bit(64) not null, b6 bit(64) not null, b7 bit(64) not null, b8 bit(64) not null, b9 bit(64) not null, b10
+bit(64) not null, b11 bit(64) not null, b12 bit(64) not null, b13 bit(64) not null, b14 bit(64) not null, b15 bit(64) not null, b16 bit(64),
+b17 bit(64) not null, b18 bit(64) not null, b19 bit(64) not null, b20 bit(64) not null, b21 bit(64) not null, b22 bit(64) not null, b23
+bit(64) not null, b24 bit(64) not null, b25 bit(64) not null, b26 bit(64) not null, b27 bit(64) not null, b28 bit(64) not null, b29 bit(64),
+b30 bit(64) not null, b31 bit(64) not null, b32 bit(64) not null, b33 bit(64) not null, b34 bit(64) not null, b35 bit(64) not null, b36
+bit(64) not null, b37 bit(64) not null, b38 bit(64) not null, b39 bit(64) not null, b40 bit(64) not null, b41 bit(64) not null, b42 bit(64),
+b43 bit(64) not null, b44 bit(64) not null, b45 bit(64) not null, b46 bit(64) not null, b47 bit(64) not null, b48 bit(64) not null, b49
+bit(64) not null, b50 bit(64) not null, b51 bit(64) not null, b52 bit(64) not null, b53 bit(64) not null, b54 bit(64) not null, b55 bit(64),
+b56 bit(64) not null, b57 bit(64) not null, b58 bit(64) not null, b59 bit(64) not null) engine=ndb;
+insert into t1
+(b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,
+b10,b11,b12,b13,b14,b15,b16,b17,b18,b19,
+b20,b21,b22,b23,b24,b25,b26,b27,b28,b29,
+b30,b31,b32,b33,b34,b35,b36,b37,b38,b39,
+b40,b41,b42,b43,b44,b45,b46,b47,b48,b49,
+b50,b51,b52,b53,b54,b55,b56,b57,b58,b59
+) values 
+(
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000'
+),
+(
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF'
+),
+(
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000'
+),
+(
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF'
+)
+;
+select pk,
+hex(b0),hex(b1),hex(b2),hex(b3),hex(b4),hex(b5),hex(b6),hex(b7),hex(b8),hex(b9),
+hex(b10),hex(b11),hex(b12),hex(b13),hex(b14),hex(b15),hex(b16),hex(b17),hex(b18),hex(b19),
+hex(b20),hex(b21),hex(b22),hex(b23),hex(b24),hex(b25),hex(b26),hex(b27),hex(b28),hex(b29),
+hex(b30),hex(b31),hex(b32),hex(b33),hex(b34),hex(b35),hex(b36),hex(b37),hex(b38),hex(b39),
+hex(b40),hex(b41),hex(b42),hex(b43),hex(b44),hex(b45),hex(b46),hex(b47),hex(b48),hex(b49),
+hex(b50),hex(b51),hex(b52),hex(b53),hex(b54),hex(b55),hex(b56),hex(b57),hex(b58),hex(b59)
+from t1 order by pk;
+pk	hex(b0)	hex(b1)	hex(b2)	hex(b3)	hex(b4)	hex(b5)	hex(b6)	hex(b7)	hex(b8)	hex(b9)	hex(b10)	hex(b11)	hex(b12)	hex(b13)	hex(b14)	hex(b15)	hex(b16)	hex(b17)	hex(b18)	hex(b19)	hex(b20)	hex(b21)	hex(b22)	hex(b23)	hex(b24)	hex(b25)	hex(b26)	hex(b27)	hex(b28)	hex(b29)	hex(b30)	hex(b31)	hex(b32)	hex(b33)	hex(b34)	hex(b35)	hex(b36)	hex(b37)	hex(b38)	hex(b39)	hex(b40)	hex(b41)	hex(b42)	hex(b43)	hex(b44)	hex(b45)	hex(b46)	hex(b47)	hex(b48)	hex(b49)	hex(b50)	hex(b51)	hex(b52)	hex(b53)	hex(b54)	hex(b55)	hex(b56)	hex(b57)	hex(b58)	hex(b59)
+1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	!
 FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF
+3	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	!
 FFFFFFFF00000000	FFFFFFFF00000000
+4	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF
+update t1 set b5 = X'0F0F0F0F0F0F0F0F', b15 = X'F0F0F0F0F0F0F0F0', b25 = X'0F0F0F0F0F0F0F0F', b35 = X'F0F0F0F0F0F0F0F0', b45 = X'0F0F0F0F0F0F0F0F', b55 = X'F0F0F0F0F0F0F0F0';
+select pk,
+hex(b0),hex(b1),hex(b2),hex(b3),hex(b4),hex(b5),hex(b6),hex(b7),hex(b8),hex(b9),
+hex(b10),hex(b11),hex(b12),hex(b13),hex(b14),hex(b15),hex(b16),hex(b17),hex(b18),hex(b19),
+hex(b20),hex(b21),hex(b22),hex(b23),hex(b24),hex(b25),hex(b26),hex(b27),hex(b28),hex(b29),
+hex(b30),hex(b31),hex(b32),hex(b33),hex(b34),hex(b35),hex(b36),hex(b37),hex(b38),hex(b39),
+hex(b40),hex(b41),hex(b42),hex(b43),hex(b44),hex(b45),hex(b46),hex(b47),hex(b48),hex(b49),
+hex(b50),hex(b51),hex(b52),hex(b53),hex(b54),hex(b55),hex(b56),hex(b57),hex(b58),hex(b59)
+from t1 order by pk;
+pk	hex(b0)	hex(b1)	hex(b2)	hex(b3)	hex(b4)	hex(b5)	hex(b6)	hex(b7)	hex(b8)	hex(b9)	hex(b10)	hex(b11)	hex(b12)	hex(b13)	hex(b14)	hex(b15)	hex(b16)	hex(b17)	hex(b18)	hex(b19)	hex(b20)	hex(b21)	hex(b22)	hex(b23)	hex(b24)	hex(b25)	hex(b26)	hex(b27)	hex(b28)	hex(b29)	hex(b30)	hex(b31)	hex(b32)	hex(b33)	hex(b34)	hex(b35)	hex(b36)	hex(b37)	hex(b38)	hex(b39)	hex(b40)	hex(b41)	hex(b42)	hex(b43)	hex(b44)	hex(b45)	hex(b46)	hex(b47)	hex(b48)	hex(b49)	hex(b50)	hex(b51)	hex(b52)	hex(b53)	hex(b54)	hex(b55)	hex(b56)	hex(b57)	hex(b58)	hex(b59)
+1	0	0	0	0	0	F0F0F0F0F0F0F0F	0	0	0	0	0	0	0	0	0	F0F0F0F0F0F0F0F0	0	0	0	0	0	0	0	0	0	F0F0F0F0F0F0F0F	0	0	0	0	0	0	0	0	0	F0F0F0F0F0F0F0F0	0	0	0	0	0	0	0	0	0	F0F0F0F0F0F0F0F	0	0	0	0	0	0	0	0	0	F0F0F0F0F0F0F0F0	0	0	0	0
+2	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	F0F0F0F0F0F0F0F	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	F0F0F0F0F0F0F0F0	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	F0F0F0F0F0F0F0F	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	F0F0F0F0F0F0F0F0	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	F0F0F0F0F0F0F0F	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	F0F0F0F0F0F0F0F0	FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF	FFF!
 FFFFFFFFFFFFF	FFFFFFFFFFFFFFFF
+3	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	F0F0F0F0F0F0F0F	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	F0F0F0F0F0F0F0F0	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	F0F0F0F0F0F0F0F	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	F0F0F0F0F0F0F0F0	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	F0F0F0F0F0F0F0F	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	FFFFFFFF00000000	F0F0F0F0F0F0F0F0	FFFFFFFF00000000	FFFFFFFF00000000	FFF!
 FFFFF00000000	FFFFFFFF00000000
+4	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	F0F0F0F0F0F0F0F	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	F0F0F0F0F0F0F0F0	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	F0F0F0F0F0F0F0F	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	F0F0F0F0F0F0F0F0	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	F0F0F0F0F0F0F0F	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF	F0F0F0F0F0F0F0F0	FFFFFFFF	FFFFFFFF	FFFFFFFF	FFFFFFFF
+DROP TABLE t1;

=== added file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_bitfield.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bitfield.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bitfield.test	2010-06-02 09:03:04 +0000
@@ -0,0 +1,89 @@
+--source include/have_ndb.inc
+--source include/have_binlog_format_mixed_or_row.inc
+--source include/ndb_master-slave.inc
+
+#
+# Verifies replication of bit fields
+#
+
+--connection master
+create table t1 ( pk int not null auto_increment primary key, b0 bit(64) not null, b1 bit(64) not null, b2 bit(64) not null, b3
+bit(64) not null, b4 bit(64) not null, b5 bit(64) not null, b6 bit(64) not null, b7 bit(64) not null, b8 bit(64) not null, b9 bit(64) not null, b10
+bit(64) not null, b11 bit(64) not null, b12 bit(64) not null, b13 bit(64) not null, b14 bit(64) not null, b15 bit(64) not null, b16 bit(64),
+b17 bit(64) not null, b18 bit(64) not null, b19 bit(64) not null, b20 bit(64) not null, b21 bit(64) not null, b22 bit(64) not null, b23
+bit(64) not null, b24 bit(64) not null, b25 bit(64) not null, b26 bit(64) not null, b27 bit(64) not null, b28 bit(64) not null, b29 bit(64),
+b30 bit(64) not null, b31 bit(64) not null, b32 bit(64) not null, b33 bit(64) not null, b34 bit(64) not null, b35 bit(64) not null, b36
+bit(64) not null, b37 bit(64) not null, b38 bit(64) not null, b39 bit(64) not null, b40 bit(64) not null, b41 bit(64) not null, b42 bit(64),
+b43 bit(64) not null, b44 bit(64) not null, b45 bit(64) not null, b46 bit(64) not null, b47 bit(64) not null, b48 bit(64) not null, b49
+bit(64) not null, b50 bit(64) not null, b51 bit(64) not null, b52 bit(64) not null, b53 bit(64) not null, b54 bit(64) not null, b55 bit(64),
+b56 bit(64) not null, b57 bit(64) not null, b58 bit(64) not null, b59 bit(64) not null) engine=ndb;
+
+insert into t1
+(b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,
+b10,b11,b12,b13,b14,b15,b16,b17,b18,b19,
+b20,b21,b22,b23,b24,b25,b26,b27,b28,b29,
+b30,b31,b32,b33,b34,b35,b36,b37,b38,b39,
+b40,b41,b42,b43,b44,b45,b46,b47,b48,b49,
+b50,b51,b52,b53,b54,b55,b56,b57,b58,b59
+) values 
+(
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',
+X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000',X'0000000000000000'
+),
+(
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',
+X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF',X'FFFFFFFFFFFFFFFF'
+),
+(
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',
+X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000',X'FFFFFFFF00000000'
+),
+(
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',
+X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF',X'00000000FFFFFFFF'
+)
+;
+
+--sync_slave_with_master
+select pk,
+hex(b0),hex(b1),hex(b2),hex(b3),hex(b4),hex(b5),hex(b6),hex(b7),hex(b8),hex(b9),
+hex(b10),hex(b11),hex(b12),hex(b13),hex(b14),hex(b15),hex(b16),hex(b17),hex(b18),hex(b19),
+hex(b20),hex(b21),hex(b22),hex(b23),hex(b24),hex(b25),hex(b26),hex(b27),hex(b28),hex(b29),
+hex(b30),hex(b31),hex(b32),hex(b33),hex(b34),hex(b35),hex(b36),hex(b37),hex(b38),hex(b39),
+hex(b40),hex(b41),hex(b42),hex(b43),hex(b44),hex(b45),hex(b46),hex(b47),hex(b48),hex(b49),
+hex(b50),hex(b51),hex(b52),hex(b53),hex(b54),hex(b55),hex(b56),hex(b57),hex(b58),hex(b59)
+ from t1 order by pk;
+
+--connection master
+update t1 set b5 = X'0F0F0F0F0F0F0F0F', b15 = X'F0F0F0F0F0F0F0F0', b25 = X'0F0F0F0F0F0F0F0F', b35 = X'F0F0F0F0F0F0F0F0', b45 = X'0F0F0F0F0F0F0F0F', b55 = X'F0F0F0F0F0F0F0F0';
+
+--sync_slave_with_master
+select pk,
+hex(b0),hex(b1),hex(b2),hex(b3),hex(b4),hex(b5),hex(b6),hex(b7),hex(b8),hex(b9),
+hex(b10),hex(b11),hex(b12),hex(b13),hex(b14),hex(b15),hex(b16),hex(b17),hex(b18),hex(b19),
+hex(b20),hex(b21),hex(b22),hex(b23),hex(b24),hex(b25),hex(b26),hex(b27),hex(b28),hex(b29),
+hex(b30),hex(b31),hex(b32),hex(b33),hex(b34),hex(b35),hex(b36),hex(b37),hex(b38),hex(b39),
+hex(b40),hex(b41),hex(b42),hex(b43),hex(b44),hex(b45),hex(b46),hex(b47),hex(b48),hex(b49),
+hex(b50),hex(b51),hex(b52),hex(b53),hex(b54),hex(b55),hex(b56),hex(b57),hex(b58),hex(b59)
+ from t1 order by pk;
+
+--connection master
+DROP TABLE t1;
+
+-- source include/master-slave-end.inc

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2010-05-27 08:51:31 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2010-06-02 09:03:04 +0000
@@ -4875,7 +4875,7 @@ static void ndb_unpack_record(TABLE *tab
             /* lsw is stored first */
             Uint32 *buf= (Uint32 *)(*value).rec->aRef();
             field_bit->Field_bit::store((((longlong)*buf)
-                                         & 0x000000000FFFFFFFFLL)
+                                         & 0x00000000FFFFFFFFLL)
                                         |
                                         ((((longlong)*(buf+1)) << 32)
                                          & 0xFFFFFFFF00000000LL),

Thread
bzr push into mysql-5.1-telco-6.3 branch (Martin.Skold:3208) Bug#34303Bug#54155 Bug#54168Martin Skold2 Jun