bk commit into 5.1 tree (pekka:1.1934)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.1934 05/07/07 13:41:47 pekka@stripped +2 -0
  ndb - 5.1 CHAIN fix to index build

  storage/ndb/test/ndbapi/testOIBasic.cpp
    1.49 05/07/07 13:41:06 pekka@stripped +8 -2
    CHAIN fix to index build

  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
    1.43 05/07/07 13:41:06 pekka@stripped +7 -1
    CHAIN fix to index build

# 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:	pekka
# Host:	clam.ndb.mysql.com
# Root:	/export/space/pekka/ndb/version/my51-vs

--- 1.42/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2005-07-04 14:01:06 +02:00
+++ 1.43/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2005-07-07 13:41:06 +02:00
@@ -529,10 +529,16 @@
         buildPtr.p->m_tupleNo= firstTupleNo;
         break;
       }
-      if ((page_ptr->get_index_word(pageIndex) & 0xFFFF0000) == 0) {
+      Uint32 len= page_ptr->get_entry_len(pageIndex);
+      if (len == 0) {
         ljam();
         buildPtr.p->m_tupleNo++;
         break;
+      }
+      if (len & Var_page::CHAIN) {
+	ljam();
+        buildPtr.p->m_tupleNo++;
+	break;
       }
       tuple_ptr = (Tuple_header*)page_ptr->get_ptr(pageIndex);
     }

--- 1.48/storage/ndb/test/ndbapi/testOIBasic.cpp	2005-07-03 16:30:56 +02:00
+++ 1.49/storage/ndb/test/ndbapi/testOIBasic.cpp	2005-07-07 13:41:06 +02:00
@@ -4613,16 +4613,22 @@
   RUNSTEP(par, createtable, ST);
   RUNSTEP(par, invalidatetable, MT);
   for (par.m_slno = 0; par.m_slno < par.m_subloop; par.m_slno++) {
-    if (par.m_slno % 2 == 0) {
+    if (par.m_slno % 3 == 0) {
       RUNSTEP(par, createindex, ST);
       RUNSTEP(par, invalidateindex, MT);
       RUNSTEP(par, pkinsert, MT);
+      RUNSTEP(par, pkupdate, MT);
+    } else if (par.m_slno % 3 == 1) {
+      RUNSTEP(par, pkinsert, MT);
+      RUNSTEP(par, createindex, ST);
+      RUNSTEP(par, invalidateindex, MT);
+      RUNSTEP(par, pkupdate, MT);
     } else {
       RUNSTEP(par, pkinsert, MT);
+      RUNSTEP(par, pkupdate, MT);
       RUNSTEP(par, createindex, ST);
       RUNSTEP(par, invalidateindex, MT);
     }
-    RUNSTEP(par, pkupdate, MT);
     RUNSTEP(par, readverifyfull, MT);
     // leave last one alone e.g. to continue manually
     if (par.m_slno + 1 < par.m_subloop) {