bk commit into 5.1 tree (tomas:1.1917)

[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
  1.1917 05/06/01 23:12:35 tomas@stripped +1 -0
  fixed bug with bitmap_init (not) runninh inside a DBUG_ASSERT

  sql/handler.cc
    1.175 05/06/01 23:12:25 tomas@stripped +13 -2
    fixed bug with bitmap_init (not) runninh inside a DBUG_ASSERT

# 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:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325

--- 1.174/sql/handler.cc	2005-06-01 14:45:50 +02:00
+++ 1.175/sql/handler.cc	2005-06-01 23:12:25 +02:00
@@ -1373,19 +1373,30 @@
 {
   uint bitmap_size= 4*(((no_fields+1)+31)/32);
   uchar *read_buf, *write_buf;
+#ifndef DEBUG_OFF
+  my_bool r;
+#endif
   DBUG_ENTER("ha_allocate_read_write_set");
   DBUG_PRINT("info", ("no_fields = %d", no_fields));
   read_set= (MY_BITMAP*)sql_alloc(sizeof(MY_BITMAP));
   write_set= (MY_BITMAP*)sql_alloc(sizeof(MY_BITMAP));
   read_buf= (uchar*)sql_alloc(bitmap_size);
   write_buf= (uchar*)sql_alloc(bitmap_size);
-  DBUG_ASSERT(!bitmap_init(read_set, read_buf, (no_fields+1+7)/8, FALSE));
-  DBUG_ASSERT(!bitmap_init(write_set, write_buf, (no_fields+1+7)/8, FALSE));
   if (!read_set || !write_set || !read_buf || !write_buf)
   {
     ha_deallocate_read_write_set();
     DBUG_RETURN(TRUE);
   }
+#ifndef DEBUG_OFF
+  r =
+#endif
+    bitmap_init(read_set, read_buf, (no_fields+1+7)/8, FALSE);
+  DBUG_ASSERT(!r /*bitmap_init(read_set...)*/);
+#ifndef DEBUG_OFF
+  r =
+#endif
+    bitmap_init(write_set, write_buf, (no_fields+1+7)/8, FALSE);
+  DBUG_ASSERT(!r /*bitmap_init(write_set...)*/);
   ha_clear_all_set();
   DBUG_RETURN(FALSE);
 }