bzr push into mysql-5.5-cluster branch (jonas.oreland:3426 to 3427)

[jonas oreland]

 3427 jonas oreland	2011-07-06
      ndb 55 - reenable ndb_multi after having MCP:ed bug-44529. Also fix error with missing thd->clear_error()

    modified:
      mysql-test/suite/ndb/t/disabled.def
      sql/ha_ndbcluster_binlog.cc
      sql/ndb_local_connection.cc
      sql/sql_db.cc
 3426 jonas oreland	2011-07-06 [merge]
      ndb - merge 71 to 55

    added:
      mysql-test/suite/ndb/r/ndb_ddl_open_trans.result
      mysql-test/suite/ndb/t/ndb_ddl_open_trans.test
    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/suite/ndb/r/ndb_alter_table3.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_alter_table3.test
      mysql-test/suite/ndb/t/ndb_restore_compat_downward.test
      mysql-test/suite/ndb/t/ndb_share.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_bank.test
      mysql-test/suite/ndb_team/t/ndb_autodiscover.test
      storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp
=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2011-07-06 11:11:57 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2011-07-06 13:02:17 +0000
@@ -16,8 +16,6 @@ ndb_partition_error2 : Bug#40989 ndb_par
 ndb_cache_trans           : Bug#42197 Query cache and autocommit
 ndb_disconnect_ddl        : Bug#31853 flaky testcase...
 
-ndb_multi		 : SEAGULL schema distribution 
-
 ndb_sql_allow_batching   : SEAGULL WL3733 xxx_allow_batching
 
 ndb_temporary : SEAGULL patch to disallow temporary tables does not work

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-07-06 07:14:46 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-07-06 13:02:17 +0000
@@ -4515,6 +4515,7 @@ ndbcluster_check_if_local_tables_in_db(T
   build_table_filename(path, sizeof(path) - 1, dbname, "", "", 0);
   if (find_files(thd, &files, dbname, path, NullS, 0) != FIND_FILES_OK)
   {
+    thd->clear_error();
     DBUG_PRINT("info", ("Failed to find files"));
     DBUG_RETURN(true);
   }

=== modified file 'sql/ndb_local_connection.cc'
--- a/sql/ndb_local_connection.cc	2011-07-01 09:56:57 +0000
+++ b/sql/ndb_local_connection.cc	2011-07-06 13:02:17 +0000
@@ -89,6 +89,7 @@ Ndb_local_connection::execute_query(MYSQ
         should_ignore_error(ignore_mysql_errors, last_errno))
     {
       /* MySQL level error suppressed -> return success */
+      m_thd->clear_error();
       DBUG_RETURN(false);
     }
 
@@ -100,6 +101,7 @@ Ndb_local_connection::execute_query(MYSQ
          suppressor->should_ignore_error(con))
     {
       /* Error suppressed -> return sucess */
+      m_thd->clear_error();
       DBUG_RETURN(false);
     }
 

=== modified file 'sql/sql_db.cc'
--- a/sql/sql_db.cc	2011-07-05 12:46:07 +0000
+++ b/sql/sql_db.cc	2011-07-06 13:02:17 +0000
@@ -42,7 +42,12 @@
 
 #define MAX_DROP_TABLE_Q_LEN      1024
 
+#ifdef MCP_BUG44529
 const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NullS};
+#else
+const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", ".ndb", NullS};
+#endif
+
 static TYPELIB deletable_extentions=
 {array_elements(del_exts)-1,"del_exts", del_exts, NULL};
 

No bundle (reason: useless for push emails).