bk commit into 5.1 tree (jonas:1.2516)

[jonas]

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, 2007-05-08 08:16:53+02:00, jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
  into  perch.ndb.mysql.com:/home/jonas/src/51-telco
  MERGE: 1.2403.27.45

  mysql-test/r/ndb_basic.result@stripped, 2007-05-08 08:16:49+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.51.1.1

  mysql-test/t/ndb_basic.test@stripped, 2007-05-08 08:16:49+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.50.1.1

  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp@stripped, 2007-05-08 08:16:49+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.57.3.2

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-05-08 08:16:49+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.129.4.9

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-05-08 08:16:49+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.50.2.6

# 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/51-telco/RESYNC

--- 1.52/mysql-test/r/ndb_basic.result	2007-05-08 08:16:59 +02:00
+++ 1.53/mysql-test/r/ndb_basic.result	2007-05-08 08:16:59 +02:00
@@ -667,6 +667,12 @@
 31	newval
 32	newval
 drop table t1;
+create table t1 (a int primary key auto_increment) engine = ndb;
+insert into t1() values (),(),(),(),(),(),(),(),(),(),(),();
+insert into t1(a) values (20),(28);
+insert into t1() values (),(),(),(),(),(),(),(),(),(),(),();
+insert into t1() values (21), (22);
+drop table t1;
 CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;
 select * from t1;
 b

--- 1.52/mysql-test/t/ndb_basic.test	2007-05-08 08:16:59 +02:00
+++ 1.53/mysql-test/t/ndb_basic.test	2007-05-08 08:16:59 +02:00
@@ -621,6 +621,21 @@
 drop table t1;
 
 #
+# bug#27437
+connection con1;
+create table t1 (a int primary key auto_increment) engine = ndb;
+insert into t1() values (),(),(),(),(),(),(),(),(),(),(),();
+connection con2;
+insert into t1(a) values (20),(28);
+connection con1;
+insert into t1() values (),(),(),(),(),(),(),(),(),(),(),();
+connection con2;
+insert into t1() values (21), (22);
+connection con1;
+
+drop table t1;
+
+#
 # BUG#14514 Creating table with packed key fails silently
 #