From: Date: March 29 2006 9:58pm
Subject: bk commit into 5.1 tree (monty:1.2245)
List-Archive: http://lists.mysql.com/commits/4351
Message-Id: <20060329195840.61CAE10D78F2@narttu.mysql.fi>

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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.2245 06/03/29 22:58:34 monty@stripped +2 -0
  Safety fix to ensure that long event names always ends with \0
  This removes a warning about missing DBUG_ENTER while running tests

  storage/ndb/src/ndbapi/NdbBlob.cpp
    1.42 06/03/29 22:58:31 monty@stripped +2 -1
    Safety fix to ensure that long event names always ends with \0
    This removes a warning about missing DBUG_ENTER while running tests

  mysql-test/t/disabled.def
    1.115 06/03/29 22:58:31 monty@stripped +1 -0
    Disable test rpl_ndb_multi_update3 that randomly fails on Intel64

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.114/mysql-test/t/disabled.def	2006-03-28 06:48:40 +03:00
+++ 1.115/mysql-test/t/disabled.def	2006-03-29 22:58:31 +03:00
@@ -33,6 +33,7 @@
 #rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
 rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
 rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
+rpl_ndb_multi_update3   : Bug#18627: Cluster Replication: rpl_ndb_multi_update3 fails on Intel 64 bit
 rpl_ndb_log             : result not deterministic, TBD if should remove
 rpl_ndb_relay_space     : Bug#16993
 #rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails

--- 1.41/storage/ndb/src/ndbapi/NdbBlob.cpp	2006-03-29 17:03:56 +03:00
+++ 1.42/storage/ndb/src/ndbapi/NdbBlob.cpp	2006-03-29 22:58:31 +03:00
@@ -195,8 +195,9 @@
   assert(c->m_blobTable != NULL);
   const NdbTableImpl& bt = *c->m_blobTable;
   // blob event name
-  char bename[MAX_TAB_NAME_SIZE];
+  char bename[MAX_TAB_NAME_SIZE+1];
   getBlobEventName(bename, e, c);
+  bename[sizeof(bename)-1]= 0;
   be.setName(bename);
   be.setTable(bt);
   // simple assigments