bk commit into 5.1 tree (jonas:1.2292)

[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
  1.2292 06/04/05 23:25:26 jonas@stripped +3 -0
  Merge joreland@stripped:/home/bk/mysql-5.1-new
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  sql/ha_ndbcluster.cc
    1.296 06/04/05 23:25:22 jonas@stripped +0 -0
    Auto merged

  mysql-test/t/ndb_read_multi_range.test
    1.9 06/04/05 23:25:22 jonas@stripped +0 -0
    Auto merged

  mysql-test/r/ndb_read_multi_range.result
    1.7 06/04/05 23:25:22 jonas@stripped +0 -0
    Auto merged

# 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-new/RESYNC

--- 1.295/sql/ha_ndbcluster.cc	2006-03-28 15:08:31 +02:00
+++ 1.296/sql/ha_ndbcluster.cc	2006-04-05 23:25:22 +02:00
@@ -3397,8 +3397,9 @@
           The partition id has been fetched from ndb
           and has been stored directly after the hidden key
         */
+        DBUG_DUMP("key+part", (char *)pos, key_length);
         key_length= ref_length - sizeof(m_part_id);
-        part_spec.start_part= part_spec.end_part= *(pos + key_length);
+        part_spec.start_part= part_spec.end_part= *(uint32 *)(pos + key_length);
       }
       else
       {
@@ -3413,6 +3414,7 @@
       }
       DBUG_PRINT("info", ("partition id %u", part_spec.start_part));
     }
+    DBUG_DUMP("key", (char *)pos, key_length);
     DBUG_RETURN(pk_read(pos, key_length, buf, part_spec.start_part));
   }
 }
@@ -3498,7 +3500,10 @@
 #endif
     memcpy(ref, m_ref, key_length);
   }
-  
+#ifndef DBUG_OFF
+  if (table_share->primary_key == MAX_KEY && m_use_partition_function) 
+    DBUG_DUMP("key+part", (char*)ref, key_length+sizeof(m_part_id));
+#endif
   DBUG_DUMP("ref", (char*)ref, key_length);
   DBUG_VOID_RETURN;
 }
@@ -7062,7 +7067,6 @@
   hash_delete(&ndbcluster_open_tables, (byte*) *share);
   thr_lock_delete(&(*share)->lock);
   pthread_mutex_destroy(&(*share)->mutex);
-  free_root(&(*share)->mem_root, MYF(0));
 
 #ifdef HAVE_NDB_BINLOG
   if ((*share)->table)
@@ -7083,6 +7087,7 @@
 #endif
   }
 #endif
+  free_root(&(*share)->mem_root, MYF(0));
   my_free((gptr) *share, MYF(0));
   *share= 0;
 
@@ -9690,6 +9695,7 @@
   NDBDICT *dict = ndb->getDictionary();
   int error;
   const char * errmsg;
+  LINT_INIT(errmsg);
 
   switch (info->ts_cmd_type){
   case (CREATE_TABLESPACE):