List:Commits« Previous MessageNext Message »
From:jonas oreland Date:September 30 2011 9:19am
Subject:bzr push into mysql-5.5-cluster branch (jonas.oreland:3554 to 3556)
View as plain text  
 3556 jonas oreland	2011-09-30
      ndb - reenable rpl_ndb_mixed_implicit_commit_binlog, it does not fail on SET PASSWORD, it did however include a file that had moved

    modified:
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_implicit_commit_binlog.test
 3555 jonas oreland	2011-09-30
      ndb - reenable ndb_temporary, it had only changed errno (now partitioning "traps" temporary before cluster

    modified:
      mysql-test/suite/ndb/r/ndb_temporary.result
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_temporary.test
 3554 jonas oreland	2011-09-30
      ndb - add missing release of ndbcluster_dropped_tables, found in valgrind PB2\!

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_temporary.result'
--- a/mysql-test/suite/ndb/r/ndb_temporary.result	2011-01-25 09:45:42 +0000
+++ b/mysql-test/suite/ndb/r/ndb_temporary.result	2011-09-30 08:27:11 +0000
@@ -7,7 +7,7 @@ ERROR HY000: Table storage engine 'ndbcl
 drop table t1;
 CREATE TABLE bar ( id TINYINT NOT NULL AUTO_INCREMENT PRIMARY KEY ) ENGINE=NDBCluster ;
 CREATE TEMPORARY TABLE foo LIKE bar ;
-ERROR HY000: Can't create table 'test.foo' (errno: 1478)
+ERROR HY000: Cannot create temporary table with partitions
 DROP TABLE bar;
 SET SESSION storage_engine=NDBCLUSTER;
 create table t1 (a int key);

=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2011-07-06 13:02:17 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2011-09-30 08:27:11 +0000
@@ -18,8 +18,6 @@ ndb_disconnect_ddl        : Bug#31853 fl
 
 ndb_sql_allow_batching   : SEAGULL WL3733 xxx_allow_batching
 
-ndb_temporary : SEAGULL patch to disallow temporary tables does not work
-
 ndb_dbug_lock : SEAGULL gsl locking order
 
 ndb_ddl_open_trans : SEAGULL mdl locking...

=== modified file 'mysql-test/suite/ndb/t/ndb_temporary.test'
--- a/mysql-test/suite/ndb/t/ndb_temporary.test	2011-01-25 09:50:48 +0000
+++ b/mysql-test/suite/ndb/t/ndb_temporary.test	2011-09-30 08:27:11 +0000
@@ -24,7 +24,7 @@ drop table t1;
 # create temporary like on an ndb table should give an error (bug#57437)
 #
 CREATE TABLE bar ( id TINYINT NOT NULL AUTO_INCREMENT PRIMARY KEY ) ENGINE=NDBCluster ;
---error ER_CANT_CREATE_TABLE
+--error ER_PARTITION_NO_TEMPORARY
 CREATE TEMPORARY TABLE foo LIKE bar ;
 DROP TABLE bar;
 

=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2011-05-25 06:47:03 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2011-09-30 08:49:22 +0000
@@ -12,5 +12,4 @@
 
 rpl_ndb_set_null       : bug #51100
 rpl_ndb_row_implicit_commit_binlog : BUG#12586131 - fails on SET PASSWORD
-rpl_ndb_mixed_implicit_commit_binlog : BUG#12586131 - fails on SET PASSWORD
 

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_implicit_commit_binlog.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_implicit_commit_binlog.test	2011-04-19 12:19:23 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_implicit_commit_binlog.test	2011-09-30 08:49:22 +0000
@@ -3,7 +3,7 @@
 ################################################################################
 --source include/have_binlog_format_mixed.inc
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --let $engine=NDB
 --source extra/rpl_tests/rpl_implicit_commit_binlog.test

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (jonas.oreland:3554 to 3556) jonas oreland2 Oct