bk commit into 5.1 tree (tulin:1.1896)

[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.1896 05/09/14 21:06:18 tulin@stripped +2 -0
  merge

  sql/ha_ndbcluster.cc
    1.211 05/09/14 21:04:41 ndbdev@stripped +3 -3
    merge

  mysql-test/t/disabled.def
    1.14 05/09/14 21:04:41 ndbdev@stripped +1 -0
    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:	dl145c.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1-wl2325-5.0

--- 1.13/mysql-test/t/disabled.def	Wed Sep 14 20:06:06 2005
+++ 1.14/mysql-test/t/disabled.def	Wed Sep 14 21:04:41 2005
@@ -51,3 +51,4 @@
 rpl_row_do_grant:Bug 12726
 rpl_sp004:Bug 12857
 rpl_row_delayed_ins:Bug 12854 probably
+rpl_server_id2:fails in wl2325

--- 1.210/sql/ha_ndbcluster.cc	Wed Sep 14 20:01:46 2005
+++ 1.211/sql/ha_ndbcluster.cc	Wed Sep 14 21:04:41 2005
@@ -2554,9 +2554,9 @@
           {
             DBUG_PRINT("info", ("bit field H'%.8X", 
                                 (*value).rec->u_32_value()));
-            ((Field_bit *) *field)->store((longlong) 
-                                          (*value).rec->u_32_value(),
-                                          FALSE);
+            ((Field_bit *) field)->store((longlong) 
+					 (*value).rec->u_32_value(),
+					 FALSE);
           }
           else
           {