bk commit into 5.1 tree (tulin:1.1857)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.1857 05/07/20 00:40:49 tulin@stripped +3 -0
  merge

  sql/sql_bitmap.h
    1.14 05/07/20 00:40:08 tulin@stripped +1 -1
    merge

  sql/ha_partition.cc
    1.2 05/07/20 00:40:08 tulin@stripped +19 -2
    merge

  mysys/my_bitmap.c
    1.36 05/07/20 00:40:08 tulin@stripped +3 -2
    merge

# 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:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1

--- 1.35/mysys/my_bitmap.c	Tue Jul 19 21:56:06 2005
+++ 1.36/mysys/my_bitmap.c	Wed Jul 20 00:40:08 2005
@@ -351,11 +351,12 @@
 void bitmap_set_above(MY_BITMAP *map, uint from_byte, uint use_bit)
 {
   uchar use_byte= use_bit ? 0xff : 0;
-  uchar *to= map->bitmap + from_byte;
-  uchar *end= map->bitmap + map->bitmap_size;
+  uchar *to= (uchar *)map->bitmap + from_byte;
+  uchar *end= (uchar *)map->bitmap + (map->n_bits+7)/8;
 
   while (to < end)
     *to++= use_byte;
+  *map->last_word_ptr|= map->last_word_mask; /*Set last bits again*/
 }
 
 

--- 1.1/sql/ha_partition.cc	Mon Jul 18 13:30:37 2005
+++ 1.2/sql/ha_partition.cc	Wed Jul 20 00:40:08 2005
@@ -67,8 +67,25 @@
                 MODULE create/delete handler object
 ****************************************************************************/
 
+static handlerton partition_hton = {
+  "partition",
+  0, /* slot */
+  0, /* savepoint size */
+  NULL /*ndbcluster_close_connection*/,
+  NULL, /* savepoint_set */
+  NULL, /* savepoint_rollback */
+  NULL, /* savepoint_release */
+  NULL /*ndbcluster_commit*/,
+  NULL /*ndbcluster_rollback*/,
+  NULL, /* prepare */
+  NULL, /* recover */
+  NULL, /* commit_by_xid */
+  NULL, /* rollback_by_xid */
+  HTON_NO_FLAGS
+};
+
 ha_partition::ha_partition(TABLE *table)
-  :handler(table), m_part_info(NULL), m_create_handler(FALSE),
+  :handler(&partition_hton, table), m_part_info(NULL), m_create_handler(FALSE),
    m_is_sub_partitioned(0)
 {
   DBUG_ENTER("ha_partition::ha_partition(table)");
@@ -86,7 +103,7 @@
 
 
 ha_partition::ha_partition(partition_info *part_info)
-  :handler(NULL), m_part_info(part_info), m_create_handler(TRUE),
+  :handler(&partition_hton, NULL), m_part_info(part_info), m_create_handler(TRUE),
    m_is_sub_partitioned(is_sub_partitioned(m_part_info))
 
 {

--- 1.13/sql/sql_bitmap.h	Tue Jul 19 20:43:25 2005
+++ 1.14/sql/sql_bitmap.h	Wed Jul 20 00:40:08 2005
@@ -55,7 +55,7 @@
   void intersect_extended(ulonglong map2buff)
   {
     intersect(map2buff);
-    if (map.bitmap_size > sizeof(ulonglong))
+    if (map.n_bits > sizeof(ulonglong) * 8)
       bitmap_set_above(&map, sizeof(ulonglong),
                        test(map2buff & (LL(1) << (sizeof(ulonglong) * 8 - 1))));
   }