bk commit into 5.1 tree (pekka:1.2130)

[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.2130 06/02/17 22:35:53 pekka@stripped +2 -0
  Merge pnousiainen@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/space/pekka/ndb/version/my51

  sql/ha_ndbcluster.cc
    1.273 06/02/17 22:35:36 pekka@stripped +0 -0
    Auto merged

  mysql-test/t/disabled.def
    1.77 06/02/17 22:35:35 pekka@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.76/mysql-test/t/disabled.def	2006-02-17 21:01:23 +01:00
+++ 1.77/mysql-test/t/disabled.def	2006-02-17 22:35:35 +01:00
@@ -42,6 +42,6 @@
 rpl_until               : Unstable test case, bug#15886
 sp-goto                 : GOTO is currently is disabled - will be fixed in the future
 subselect               : Bug#15706 (ps mode) [PATCH PENDING]
-rpl_ndb_blob            : Bug #17505
+#rpl_ndb_blob            : Bug #17505
 rpl_ndb_blob2           : Bug #17505
 rpl_ndb_log             : results are not deterministic

--- 1.272/sql/ha_ndbcluster.cc	2006-02-17 17:12:18 +01:00
+++ 1.273/sql/ha_ndbcluster.cc	2006-02-17 22:35:36 +01:00
@@ -5525,7 +5525,7 @@
     {
       NDBDICT::List::Element& elmt= list.elements[i];
       int do_handle_table= 0;
-      if (IS_TMP_PREFIX(elmt.name))
+      if (IS_TMP_PREFIX(elmt.name) || IS_NDB_BLOB_PREFIX(elmt.name))
       {
         DBUG_PRINT("info", ("Skipping %s.%s in NDB", elmt.database, elmt.name));
         continue;
@@ -5662,7 +5662,7 @@
   for (i= 0 ; i < list.count ; i++)
   {
     NDBDICT::List::Element& elmt= list.elements[i];
-    if (IS_TMP_PREFIX(elmt.name))
+    if (IS_TMP_PREFIX(elmt.name) || IS_NDB_BLOB_PREFIX(elmt.name))
     {
       DBUG_PRINT("info", ("Skipping %s.%s in NDB", elmt.database, elmt.name));
       continue;