List:Commits« Previous MessageNext Message »
From:jonas Date:November 20 2006 11:36am
Subject:bk commit into 5.1 tree (jonas:1.2082)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-20 11:36:47+01:00, jonas@stripped +3 -0
  ndb -
    fix bug in prev. changeset
    reset bitPos after processing of bitfields

  mysql-test/r/ndb_bitfield.result@stripped, 2006-11-20 11:36:45+01:00,
jonas@stripped +22 -0
    Add 1 more test

  mysql-test/t/ndb_bitfield.test@stripped, 2006-11-20 11:36:45+01:00, jonas@stripped
+14 -0
    Add 1 more test

  storage/ndb/src/ndbapi/NdbReceiver.cpp@stripped, 2006-11-20 11:36:45+01:00,
jonas@stripped +1 -0
    Fix so that bitPos is reset after processing of bitfields

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-wl2325-5.0-drop6

--- 1.21/storage/ndb/src/ndbapi/NdbReceiver.cpp	2006-11-20 11:36:50 +01:00
+++ 1.22/storage/ndb/src/ndbapi/NdbReceiver.cpp	2006-11-20 11:36:50 +01:00
@@ -305,6 +305,7 @@
 	break;
       }
 
+      bitPos = 0;
       currRecAttr->receive_data((Uint32*)src, sz);
       src += sz;
   next:

--- 1.6/mysql-test/r/ndb_bitfield.result	2006-11-20 11:36:50 +01:00
+++ 1.7/mysql-test/r/ndb_bitfield.result	2006-11-20 11:36:50 +01:00
@@ -196,6 +196,28 @@
 INSERT INTO `t1` VALUES
(6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x20,0x12,0x1F,4,5,5,5,5,5,5,5,5,5,3,2,1);
 INSERT INTO `t1` VALUES
(7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x00,0x0C,0x3F,4,5,5,5,5,5,5,5,5,5,3,2,1);
 INSERT INTO `t1` VALUES
(8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0x3F,0x00,0x00,4,5,5,5,5,5,5,5,5,5,3,2,1);
+select a001, a010, a012, a015, a016, a017, a019, a029
+a030, a031, a032, a042, a043, a044, a3001, a3002,
+a3003, a3004, a3005, a3021, a3022, hex(a), hex(b), hex(c),
+d, e, f, g, h, i, j, k, l, m, n, o, a034
+from t1
+order by dummyKey = 1;
+a001	a010	a012	a015	a016	a017	a019	a030	a031	a032	a042	a043	a044	a3001	a3002	a3003	a3004	a3005	a3021	a3022	hex(a)	hex(b)	hex(c)	d	e	f	g	h	i	j	k	l	m	n	o	a034
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	C	3F	4	5	5	5	5	5	5	5	5	5	3	2	1
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	F	3B	4	5	5	5	5	5	5	5	5	5	3	2	1
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	20	12	1F	4	5	5	5	5	5	5	5	5	5	3	2	1
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10	21	2F	4	5	5	5	5	5	5	5	5	5	3	2	1
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3F	0	0	4	5	5	5	5	5	5	5	5	5	3	2	1
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	3D	4	5	5	5	5	5	5	5	5	5	3	2	1
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	30	37	4	5	5	5	5	5	5	5	5	5	3	2	1
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	3F	3E	4	5	5	5	5	5	5	5	5	5	3	2	1
+select a001, a010, a012, a015, a016, a017, a019, a029
+a030, a031, a032, a042, a043, a044, a3001, a3002,
+a3003, a3004, a3005, a3021, a3022, hex(a), hex(b), hex(c),
+d, e, f, g, h, i, j, k, l, m, n, o, a034
+from t1 where dummyKey = 1;
+a001	a010	a012	a015	a016	a017	a019	a030	a031	a032	a042	a043	a044	a3001	a3002	a3003	a3004	a3005	a3021	a3022	hex(a)	hex(b)	hex(c)	d	e	f	g	h	i	j	k	l	m	n	o	a034
+1	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	3F	3E	4	5	5	5	5	5	5	5	5	5	3	2	1
 drop table t1;
 create table t1 (
 pk1 bit(9) not null primary key,

--- 1.5/mysql-test/t/ndb_bitfield.test	2006-11-20 11:36:50 +01:00
+++ 1.6/mysql-test/t/ndb_bitfield.test	2006-11-20 11:36:50 +01:00
@@ -97,6 +97,20 @@
 (7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000000',b'001100',b'111111',4,5,5,5,5,5,5,5,5,5,3,2,1),
 (8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'111111',b'000000',b'000000',4,5,5,5,5,5,5,5,5,5,3,2,1);
 --exec $MYSQL_DUMP --hex-blob --compact --order-by-primary --skip-extended-insert
--no-create-info test t1
+
+select a001, a010, a012, a015, a016, a017, a019, a029
+       a030, a031, a032, a042, a043, a044, a3001, a3002,
+       a3003, a3004, a3005, a3021, a3022, hex(a), hex(b), hex(c),
+       d, e, f, g, h, i, j, k, l, m, n, o, a034
+from t1
+order by dummyKey = 1;
+
+select a001, a010, a012, a015, a016, a017, a019, a029
+       a030, a031, a032, a042, a043, a044, a3001, a3002,
+       a3003, a3004, a3005, a3021, a3022, hex(a), hex(b), hex(c),
+       d, e, f, g, h, i, j, k, l, m, n, o, a034
+from t1 where dummyKey = 1;
+
 drop table t1;
 
 --error 1005
Thread
• bk commit into 5.1 tree (jonas:1.2082)jonas21 Nov