bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3217)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/5.5-cluster/ based on revid:magnus.blaudd@strippedu

 3217 Magnus Blåudd	2011-02-21
      ndb
       - ifdef code which removes a table in ndbcluster_find_files(), used by
         SHOW TABLES and "SELECT * from I_S.TABLES" since mysql_rm_table_part2()
         it removed in 5.5.8. This will cause ndb_team.ndb_autodiscover3.test
         to fail.

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_glue.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-02-20 20:56:24 +0000
+++ b/sql/ha_ndbcluster.cc	2011-02-21 09:11:01 +0000
@@ -10604,6 +10604,7 @@ int ndbcluster_find_files(handlerton *ht
     }
   }
 
+#ifndef NDB_NO_MYSQL_RM_TABLE_PART2
   /*
     Delete old files
 
@@ -10640,6 +10641,7 @@ int ndbcluster_find_files(handlerton *ht
     /* Clear error message that is returned when table is deleted */
     thd->clear_error();
   }
+#endif
 
   // Create new files
   List_iterator_fast<char> it2(create_list);

=== modified file 'sql/ha_ndbcluster_glue.h'
--- a/sql/ha_ndbcluster_glue.h	2011-02-09 11:28:03 +0000
+++ b/sql/ha_ndbcluster_glue.h	2011-02-21 09:11:01 +0000
@@ -92,6 +92,9 @@ enum column_format_type {
 /* Global schema lock not available */
 #define NDB_NO_GLOBAL_SCHEMA_LOCK
 
+/* No mysql_rm_table_part2 anymore in 5.5.8 */
+#define NDB_NO_MYSQL_RM_TABLE_PART2
+
 /*
   The enum open_table_mode has been removed in 5.5.7 and 'open_table_from_share'
   now takes "bool is_create_table" instead of the enum type. Define OTM_OPEN

Attachment: [text/bzr-bundle] bzr/[e-mail]