bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4003)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4003 Magnus Blåudd	2010-11-15
      ndb
        - move the DBUG_ASSERTS into the relevant ifdefs since thd
          has no prelocked_mode in 5.5

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2010-11-15 09:15:27 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2010-11-15 09:18:27 +0000
@@ -279,9 +279,11 @@ static void run_query(THD *thd, char *bu
   DBUG_PRINT("query", ("%s", thd->query()));
 
   DBUG_ASSERT(!thd->in_sub_stmt);
-  DBUG_ASSERT(!thd->prelocked_mode);
 
 #if MYSQL_VERSION_ID >= 50501
+
+  DBUG_ASSERT(!thd->locked_tables_mode);
+
   {
     Parser_state parser_state;
     if (!parser_state.init(thd, thd->query(), thd->query_length()))
@@ -316,6 +318,9 @@ static void run_query(THD *thd, char *bu
   */
   thd->stmt_da->reset_diagnostics_area();
 #else
+
+  DBUG_ASSERT(!thd->prelocked_mode);
+
   const char* found_semicolon= NULL;
   mysql_parse(thd, thd->query(), thd->query_length(), &found_semicolon);
 

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