bk commit into 5.1 tree (pekka:1.2051)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.2051 06/01/13 00:22:16 pekka@stripped +1 -0
  ndb - mysql-5.1-wl2325-v7 quick fix

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.30 06/01/13 00:20:26 pekka@stripped +5 -5
    separate events as default + typos

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-wl2325-v7

--- 1.29/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-12 19:50:35 +01:00
+++ 1.30/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-13 00:20:26 +01:00
@@ -104,7 +104,7 @@
 
   m_state= EO_CREATED;
 
-  m_separateEvents = false;
+  m_separateEvents = true;
 
   m_has_error= 0;
 
@@ -1733,7 +1733,7 @@
 
     CHARSET_INFO* cs = col->m_cs ? col->m_cs : &my_charset_bin;
     (*cs->coll->hash_sort)(cs, dptr + lb, len, &nr1, &nr2);
-    dptr += bytesize;
+    dptr += ((bytesize + 3) / 4) * 4;
   }
   return nr1;
 }
@@ -1757,7 +1757,7 @@
     AttributeHeader ah2(*hptr2++);
     // sizes can differ on update of varchar endspace
     Uint32 bytesize1 = ah1.getByteSize();
-    Uint32 bytesize2 = ah1.getByteSize();
+    Uint32 bytesize2 = ah2.getByteSize();
     assert(dptr1 + bytesize1 <= (uchar*)(ptr1[1].p + ptr1[1].sz));
     assert(dptr2 + bytesize2 <= (uchar*)(ptr2[1].p + ptr2[1].sz));
 
@@ -1776,8 +1776,8 @@
     int res = (cs->coll->strnncollsp)(cs, dptr1 + lb1, len1, dptr2 + lb2, len2, false);
     if (res != 0)
       return false;
-    dptr1 += bytesize1;
-    dptr2 += bytesize2;
+    dptr1 += ((bytesize1 + 3) / 4) * 4;
+    dptr2 += ((bytesize2 + 3) / 4) * 4;
   }
   return true;
 }