bk commit into 5.1 tree (tomas:1.2518)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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-04 11:58:23+02:00, tomas@stripped +4 -0
  bugfix in checksum with force varpart

  mysql-test/mysql-test-run.pl@stripped, 2007-05-04 11:58:21+02:00, tomas@stripped +1 -1
    bigger needed for running some tests

  mysql-test/r/ndb_row_format.result@stripped, 2007-05-04 11:58:21+02:00, tomas@stripped +26 -0
    bugfix in checksum with force varpart

  mysql-test/t/ndb_row_format.test@stripped, 2007-05-04 11:58:21+02:00, tomas@stripped +24 -0
    bugfix in checksum with force varpart

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-05-04 11:58:21+02:00, tomas@stripped +6 -0
    bugfix in checksum with force varpart

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.1

--- 1.264/mysql-test/mysql-test-run.pl	2007-02-21 15:01:39 +01:00
+++ 1.265/mysql-test/mysql-test-run.pl	2007-05-04 11:58:21 +02:00
@@ -2385,7 +2385,7 @@
     else
     {
       $ndb_no_ord=32;
-      $ndb_con_op=5000;
+      $ndb_con_op=10000;
       $ndb_dmem="20M";
       $ndb_imem="1M";
       $ndb_pbmem="4M";

--- 1.58/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-04-30 12:57:07 +02:00
+++ 1.59/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-05-04 11:58:21 +02:00
@@ -2838,6 +2838,12 @@
     if (unlikely(realloc_var_part(regFragPtr, regTabPtr, pagePtr, 
 				  refptr, alloc, needed)))
       return -1;
+
+    if (regTabPtr->m_bits & Tablerec::TR_Checksum) 
+    {
+      jam();
+      setChecksum(org, regTabPtr);
+    }
   }
   req_struct->m_tuple_ptr->m_header_bits = copy_bits;
   return 0;

--- 1.2/mysql-test/r/ndb_row_format.result	2007-04-26 21:31:59 +02:00
+++ 1.3/mysql-test/r/ndb_row_format.result	2007-05-04 11:58:21 +02:00
@@ -37,3 +37,29 @@
 ENGINE=NDB;
 ForceVarPart: 1
 DROP TABLE t1;
+create table t1 (a int auto_increment primary key, b varchar(1000)) engine = ndb;
+insert into t1(b) values ('0123456789');
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+select count(*) from t1;
+count(*)
+1024
+begin;
+update t1 set b = concat(b,b);
+update t1 set b = concat(b,b);
+update t1 set b = concat(b,b);
+update t1 set b = concat(b,b);
+update t1 set b = concat(b,b);
+rollback;
+select count(*),b from t1 group by b;
+count(*)	b
[phone]
+drop table t1;

--- 1.1/mysql-test/t/ndb_row_format.test	2007-04-26 13:36:48 +02:00
+++ 1.2/mysql-test/t/ndb_row_format.test	2007-05-04 11:58:21 +02:00
@@ -60,3 +60,27 @@
   ENGINE=NDB;
 --exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d test t1 | grep ForceVarPart
 DROP TABLE t1;
+
+# test of bug
+create table t1 (a int auto_increment primary key, b varchar(1000)) engine = ndb;
+insert into t1(b) values ('0123456789');
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+insert into t1(b) select b from t1;
+select count(*) from t1;
+begin;
+update t1 set b = concat(b,b);
+update t1 set b = concat(b,b);
+update t1 set b = concat(b,b);
+update t1 set b = concat(b,b);
+update t1 set b = concat(b,b);
+rollback;
+select count(*),b from t1 group by b;
+drop table t1;