List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:July 7 2011 10:08am
Subject:bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4248 to 4249)
View as plain text  
 4249 Jonas Oreland	2011-07-07 [merge]
      ndb - merge 70 to 71

    modified:
      mysql-test/suite/ndb/r/ndb_share.result
      mysql-test/suite/ndb/t/ndb_share.cnf
      mysql-test/suite/ndb/t/ndb_share.test
 4248 jonas oreland	2011-07-06 [merge]
      ndb - merge 70 to 71

    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/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
=== modified file 'mysql-test/suite/ndb/r/ndb_share.result'
--- a/mysql-test/suite/ndb/r/ndb_share.result	2011-07-06 06:47:16 +0000
+++ b/mysql-test/suite/ndb/r/ndb_share.result	2011-07-07 10:00:25 +0000
@@ -50,6 +50,22 @@ set global ndb_check_shares=1;
 set global ndb_check_shares=1;
 set global ndb_check_shares=1;
 set global ndb_check_shares=1;
+create table t1 (a int primary key) engine=ndbcluster
+partition by list(a) (partition p0 values in (0));
+alter offline table t1 add partition (partition p1 values in (1));
+drop table t1;
+set global ndb_check_shares=1;
+set global ndb_check_shares=1;
+set global ndb_check_shares=1;
+set global ndb_check_shares=1;
+create table t1 (a int primary key) engine=ndbcluster
+partition by list(a) (partition p0 values in (0));
+alter offline table t1 add partition (partition p1 values in (1));
+drop table t1;
+set global ndb_check_shares=1;
+set global ndb_check_shares=1;
+set global ndb_check_shares=1;
+set global ndb_check_shares=1;
 create table t1 (a int primary key) engine=ndbcluster;
 alter online table t1 add column b int column_format dynamic;
 drop table t1;

=== modified file 'mysql-test/suite/ndb/t/ndb_share.cnf'
--- a/mysql-test/suite/ndb/t/ndb_share.cnf	2011-07-05 14:19:56 +0000
+++ b/mysql-test/suite/ndb/t/ndb_share.cnf	2011-07-07 10:00:25 +0000
@@ -4,15 +4,19 @@
 mysqld=,,,
 
 [mysqld.1.1]
+new
 log-bin=mysqld-bin
 
 [mysqld.2.1]
+new
 log-bin=mysqld-bin
 
 [mysqld.3.1]
+new
 skip-log-bin
 
 [mysqld.4.1]
+new
 skip-log-bin
 
 [ENV]

=== modified file 'mysql-test/suite/ndb/t/ndb_share.test'
--- a/mysql-test/suite/ndb/t/ndb_share.test	2011-07-06 08:44:11 +0000
+++ b/mysql-test/suite/ndb/t/ndb_share.test	2011-07-07 10:00:25 +0000
@@ -63,6 +63,24 @@ drop table t1;
 --source suite/ndb/include/ndb_share_check_shares.inc
 
 #
+# Basic create+offline-alter-partitions+drop (from with and without log-bin)
+#   no share should be present
+#
+connection server1;
+create table t1 (a int primary key) engine=ndbcluster
+partition by list(a) (partition p0 values in (0));
+alter offline table t1 add partition (partition p1 values in (1));
+drop table t1;
+--source suite/ndb/include/ndb_share_check_shares.inc
+
+connection server2;
+create table t1 (a int primary key) engine=ndbcluster
+partition by list(a) (partition p0 values in (0));
+alter offline table t1 add partition (partition p1 values in (1));
+drop table t1;
+--source suite/ndb/include/ndb_share_check_shares.inc
+
+#
 # Basic create+online-alter+drop (from with and without log-bin)
 #   no share should be present
 #

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4248 to 4249) Jonas Oreland10 Jul