bk commit into 5.1 tree (aelkin:1.2413)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin 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@stripped, 2007-05-07 10:35:27+03:00, aelkin@stripped +1 -0
  WL3557 conflict detection
  
  removing part of bugs' fixes because of tests did not pass.

  sql/ha_ndbcluster.cc@stripped, 2007-05-07 10:35:24+03:00, aelkin@stripped +0 -12
    removing a hack made by bug#22583 for ndb.
    Consequently, for WL's tests to pass the fix for 
    Bug #26591 Cluster handler does not set bits in null bytes correctly
    might be needed.

# 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:	aelkin
# Host:	dsl-hkibras-fe31f900-164.dhcp.inet.fi
# Root:	/home/elkin/MySQL/TEAM/FIXES/5.1/wl3557_conflict_detection

--- 1.385/sql/ha_ndbcluster.cc	2007-04-24 11:32:57 +03:00
+++ 1.386/sql/ha_ndbcluster.cc	2007-05-07 10:35:24 +03:00
@@ -3112,18 +3112,6 @@ void ndb_unpack_record(TABLE *table, Ndb
 
   // Set null flag(s)
   bzero(buf, table->s->null_bytes);
-
-  /*
-    Set the X bit and the filler bits of the null byte, since they are
-    not touched in the code below.
-
-    The X bit is the LSB in the first byte
-    The filler bits are the MSBs in the last null byte
-  */
-  buf[0]|= 1;
-  if (table->s->null_bytes > 0)
-    buf[table->s->null_bytes - 1]|= 256U - (1U << table->s->last_null_bit_pos);
-
   for ( ; field;
        p_field++, value++, field= *p_field)
   {