bk commit into 5.0 tree (jonas:1.1977) BUG#16125

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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
  1.1977 06/01/02 14:38:38 jonas@stripped +3 -0
  bug#16125 - ndb bitfield of exact 32 bits, incorrect assertion (i.e. only noticable in
debug compiled)

  ndb/include/util/Bitmask.hpp
    1.17 06/01/02 14:38:35 jonas@stripped +2 -2
    bug#16125

  mysql-test/t/ndb_bitfield.test
    1.5 06/01/02 14:38:35 jonas@stripped +8 -0
    bug#16125

  mysql-test/r/ndb_bitfield.result
    1.5 06/01/02 14:38:35 jonas@stripped +6 -0
    bug#16125

# 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/50-work

--- 1.16/ndb/include/util/Bitmask.hpp	2004-12-10 16:15:33 +01:00
+++ 1.17/ndb/include/util/Bitmask.hpp	2006-01-02 14:38:35 +01:00
@@ -814,7 +814,7 @@
 BitmaskImpl::getField(unsigned size, const Uint32 src[],
 		      unsigned pos, unsigned len, Uint32 dst[])
 {
-  assert(pos + len < (size << 5));
+  assert(pos + len <= (size << 5));
   
   src += (pos >> 5);
   Uint32 offset = pos & 31;
@@ -833,7 +833,7 @@
 BitmaskImpl::setField(unsigned size, Uint32 dst[],
 		      unsigned pos, unsigned len, const Uint32 src[])
 {
-  assert(pos + len < (size << 5));
+  assert(pos + len <= (size << 5));
 
   dst += (pos >> 5);
   Uint32 offset = pos & 31;

--- 1.4/mysql-test/r/ndb_bitfield.result	2005-09-14 15:46:28 +02:00
+++ 1.5/mysql-test/r/ndb_bitfield.result	2006-01-02 14:38:35 +01:00
@@ -208,3 +208,9 @@
 key(b)
 ) engine=ndbcluster;
 ERROR HY000: Can't create table './test/t1.frm' (errno: 743)
+create table t1 (
+pk1 int primary key,
+b bit(32) not null
+) engine=ndbcluster;
+insert into t1 values (1,1);
+drop table t1;

--- 1.4/mysql-test/t/ndb_bitfield.test	2005-09-14 15:46:28 +02:00
+++ 1.5/mysql-test/t/ndb_bitfield.test	2006-01-02 14:38:35 +01:00
@@ -112,3 +112,11 @@
   key(b)
 ) engine=ndbcluster;
 
+# bug#16125
+create table t1 (
+  pk1 int primary key,
+  b bit(32) not null
+) engine=ndbcluster;
+
+insert into t1 values (1,1);
+drop table t1;