List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:June 8 2011 7:42pm
Subject:bzr push into mysql-trunk-cluster branch (magnus.blaudd:3318 to 3322)
View as plain text  
 3322 magnus.blaudd@stripped	2011-06-08
      ndb
       - update .result file for new error meesage of 'Unknown table' which now
         also includes database name

    modified:
      mysql-test/suite/ndb/r/ndb_multi_row.result
 3321 magnus.blaudd@stripped	2011-06-08 [merge]
      Merge 5.5-cluster -> trunk-cluster

    modified:
      mysql-test/suite/ndb_rpl/my.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf
      mysql-test/suite/ndb_team/my.cnf
      mysql-test/suite/rpl_ndb/my.cnf
 3320 magnus.blaudd@stripped	2011-06-08
      ndb
       - udate .result file for new error meesage of 'Unknown table' which now also
       includes databse name

    modified:
      mysql-test/suite/ndb/r/ndb_single_user.result
 3319 magnus.blaudd@stripped	2011-06-08
      ndb
       - update .result file after changes to loaddata_autocom.inc file

    modified:
      mysql-test/suite/ndb/r/loaddata_autocom_ndb.result
 3318 magnus.blaudd@stripped	2011-06-08
      mtr.pl lockdown
        - Temporaily reduce the footprint of mtr.pl allowing it to run with a larger
          number of failing test

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/suite/ndb/r/loaddata_autocom_ndb.result'
--- a/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result	2007-12-12 17:19:24 +0000
+++ b/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result	2011-06-08 17:33:27 +0000
@@ -1,4 +1,4 @@
-SET SESSION STORAGE_ENGINE = ndbcluster;
+SET SESSION DEFAULT_STORAGE_ENGINE = ndbcluster;
 drop table if exists t1;
 create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
 start transaction;

=== modified file 'mysql-test/suite/ndb/r/ndb_multi_row.result'
--- a/mysql-test/suite/ndb/r/ndb_multi_row.result	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb/r/ndb_multi_row.result	2011-06-08 19:38:38 +0000
@@ -63,6 +63,6 @@ t4
 drop table t1, t2, t3, t4;
 drop table if exists t1, t3, t4;
 Warnings:
-Note	1051	Unknown table 't1'
-Note	1051	Unknown table 't3'
-Note	1051	Unknown table 't4'
+Note	1051	Unknown table 'test.t1'
+Note	1051	Unknown table 'test.t3'
+Note	1051	Unknown table 'test.t4'

=== modified file 'mysql-test/suite/ndb/r/ndb_single_user.result'
--- a/mysql-test/suite/ndb/r/ndb_single_user.result	2011-01-21 14:27:30 +0000
+++ b/mysql-test/suite/ndb/r/ndb_single_user.result	2011-06-08 19:24:13 +0000
@@ -86,7 +86,7 @@ insert into t1 select * from t2;
 create unique index new_index on t1 (b,c);
 drop table t2;
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 create index new_index_fail on t1 (c);
 ERROR HY000: Got error 299 'Operation not allowed or aborted due to single user mode' from NDBCLUSTER
 insert into t1 values (21,21,0),(22,22,0),(23,23,0),(24,24,0),(25,25,0),(26,26,0),(27,27,0),(28,28,0),(29,29,0),(210,210,0);

=== modified file 'mysql-test/suite/ndb_rpl/my.cnf'
--- a/mysql-test/suite/ndb_rpl/my.cnf	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/my.cnf	2011-06-08 19:28:34 +0000
@@ -50,7 +50,6 @@ relay-log=                    slave-rela
 # Cluster only supports row format
 binlog-format=                 row
 
-init-rpl-role=                slave
 log-slave-updates
 master-retry-count=           10
 
@@ -73,8 +72,6 @@ skip-slave-start
 # test results will vary, thus a relative path is used.
 slave-load-tmpdir=            ../../../tmp
 
-rpl-recovery-rank=            @mysqld.1.slave.server-id
-
 [ENV]
 NDB_CONNECTSTRING=            @mysql_cluster.1.ndb_connectstring
 MASTER_MYPORT=                @mysqld.1.1.port

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf	2011-06-08 19:28:34 +0000
@@ -54,8 +54,6 @@ default-storage-engine=myisam
 # test results will vary, thus a relative path is used.
 slave-load-tmpdir=            ../../../tmp
 
-rpl-recovery-rank=            @mysqld.1.cluster2.server-id
-
 [mysqld.1.cluster3]
 log-bin=                      cluster3-bin
 relay-log=                    cluster3-relay-bin
@@ -71,8 +69,6 @@ default-storage-engine=myisam
 # test results will vary, thus a relative path is used.
 slave-load-tmpdir=            ../../../tmp
 
-rpl-recovery-rank=            @mysqld.1.cluster3.server-id
-
 [ENV]
 SERVER_MYPORT_1=              @mysqld.1.cluster1.port
 SERVER_MYPORT_2=              @mysqld.1.cluster2.port

=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf	2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf	2011-06-08 19:28:34 +0000
@@ -58,7 +58,6 @@ binlog_format=row
 [mysqld.1.slave]
 # Note no binlog on this slave
 server-id= 4
-init-rpl-role= slave
 skip-slave-start
 loose-skip-innodb
 slave-load-tmpdir= ../../../tmp
@@ -69,7 +68,6 @@ ndb_connectstring= @mysql_cluster.slave.
 [mysqld.2.slave]
 # Note binlog on this slave, but not logging slave updates
 server-id= 5
-init-rpl-role= slave
 skip-slave-start
 loose-skip-innodb
 slave-load-tmpdir= ../../../tmp
@@ -82,7 +80,6 @@ binlog_format=row
 [mysqld.3.slave]
 # Note binlog on this slave, with slave updates logged
 server-id= 6
-init-rpl-role= slave
 skip-slave-start
 loose-skip-innodb
 slave-load-tmpdir= ../../../tmp

=== modified file 'mysql-test/suite/ndb_team/my.cnf'
--- a/mysql-test/suite/ndb_team/my.cnf	2011-04-15 09:31:03 +0000
+++ b/mysql-test/suite/ndb_team/my.cnf	2011-06-08 19:25:29 +0000
@@ -50,7 +50,6 @@ master-connect-retry=         1
 log-bin=                      slave-bin
 relay-log=                    slave-relay-bin
 
-init-rpl-role=                slave
 log-slave-updates
 master-retry-count=           10
 
@@ -68,9 +67,6 @@ skip-slave-start
 # test results will vary, thus a relative path is used.
 slave-load-tmpdir=            ../../../tmp
 
-rpl-recovery-rank=            @mysqld.1.slave.server-id
-
-
 [ENV]
 NDB_CONNECTSTRING=            @mysql_cluster.1.ndb_connectstring
 MASTER_MYPORT=                @mysqld.1.1.port

=== modified file 'mysql-test/suite/rpl_ndb/my.cnf'
--- a/mysql-test/suite/rpl_ndb/my.cnf	2011-04-26 09:41:12 +0000
+++ b/mysql-test/suite/rpl_ndb/my.cnf	2011-06-08 19:28:34 +0000
@@ -50,7 +50,6 @@ relay-log=                    slave-rela
 # Cluster only supports row format
 binlog-format=                 row
 
-init-rpl-role=                slave
 log-slave-updates
 master-retry-count=           10
 
@@ -73,8 +72,6 @@ skip-slave-start
 # test results will vary, thus a relative path is used.
 slave-load-tmpdir=            ../../../tmp
 
-rpl-recovery-rank=            @mysqld.1.slave.server-id
-
 [ENV]
 NDB_CONNECTSTRING=            @mysql_cluster.1.ndb_connectstring
 MASTER_MYPORT=                @mysqld.1.1.port

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (magnus.blaudd:3318 to 3322) magnus.blaudd9 Jun