bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3412)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/tmp/c529EkWJRf/mysql-5.1-telco-6.3/ based on revid:jonas@stripped3kn4bg5uv3asmu4

 3412 Magnus Blåudd	2011-04-06
      Merge

    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict.test	2010-01-27 09:29:10 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict.test	2011-04-06 13:27:38 +0000
@@ -6,10 +6,8 @@
 --source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
---disable_warnings
 --disable_query_log
 --connection master
-drop table if exists mysql.ndb_replication;
 CREATE TABLE mysql.ndb_replication
   (db VARBINARY(63),
    table_name VARBINARY(63),
@@ -18,14 +16,6 @@ CREATE TABLE mysql.ndb_replication
    conflict_fn VARBINARY(128),
    PRIMARY KEY USING HASH (db,table_name,server_id))
   ENGINE=NDB PARTITION BY KEY(db,table_name);
-
-drop table if exists t1_old;
-drop table if exists `test`.`t1_old$EX`;
-drop table if exists t1_max;
-drop table if exists `test`.`t1_max$EX`;
-drop table if exists t1_max_delete_win;
-drop table if exists `test`.`t1_max_delete_win$EX`;
---enable_warnings
 --enable_query_log
 
 # only test with binlog_type = 7, as everything else feels insane in context of conflict resolution
@@ -123,3 +113,5 @@ delete from t1_max;
 drop table mysql.ndb_replication;
 drop table t1_old, `t1_old$EX`, t1_max, `t1_max$EX`, t1_max_delete_win, `t1_max_delete_win$EX`;
 --sync_slave_with_master
+
+--source include/master-slave-end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test	2010-01-27 09:29:10 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test	2011-04-06 13:27:38 +0000
@@ -6,10 +6,8 @@
 --source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
---disable_warnings
 --disable_query_log
 --connection master
-drop table if exists mysql.ndb_replication;
 CREATE TABLE mysql.ndb_replication
   (db VARBINARY(63),
    table_name VARBINARY(63),
@@ -18,8 +16,6 @@ CREATE TABLE mysql.ndb_replication
    conflict_fn VARBINARY(128),
    PRIMARY KEY USING HASH (db,table_name,server_id))
   ENGINE=NDB PARTITION BY KEY(db,table_name);
-drop table if exists `test`.`t1$EX`;
-drop table if exists `test`.`t2$EX`;
 create table `test`.`t1$EX`
   (server_id int unsigned,
    master_server_id int unsigned,
@@ -28,7 +24,6 @@ create table `test`.`t1$EX`
    a int not null,
    d varchar(9) not null,
    primary key(server_id, master_server_id, master_epoch, count)) engine ndb;
---enable_warnings
 --enable_query_log
 
 --echo *** Test 1 ********************************************************
@@ -78,3 +73,5 @@ drop table mysql.ndb_replication;
 drop table `test`.`t1$EX`;
 --sync_slave_with_master
 --enable_query_log
+
+--source include/master-slave-end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win.test	2010-01-27 09:29:10 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win.test	2011-04-06 13:27:38 +0000
@@ -6,10 +6,8 @@
 --source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
---disable_warnings
 --disable_query_log
 --connection master
-drop table if exists mysql.ndb_replication;
 CREATE TABLE mysql.ndb_replication
   (db VARBINARY(63),
    table_name VARBINARY(63),
@@ -18,8 +16,6 @@ CREATE TABLE mysql.ndb_replication
    conflict_fn VARBINARY(128),
    PRIMARY KEY USING HASH (db,table_name,server_id))
   ENGINE=NDB PARTITION BY KEY(db,table_name);
-drop table if exists `test`.`t1$EX`;
-drop table if exists `test`.`t2$EX`;
 create table `test`.`t1$EX`
   (server_id int unsigned,
    master_server_id int unsigned,
@@ -28,7 +24,6 @@ create table `test`.`t1$EX`
    a int not null,
    d varchar(9) not null,
    primary key(server_id, master_server_id, master_epoch, count)) engine ndb;
---enable_warnings
 --enable_query_log
 
 --echo *** Test 1 ********************************************************
@@ -78,3 +73,5 @@ drop table mysql.ndb_replication;
 drop table `test`.`t1$EX`;
 --sync_slave_with_master
 --enable_query_log
+
+--source include/master-slave-end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test	2010-01-27 09:29:10 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test	2011-04-06 13:27:38 +0000
@@ -6,10 +6,8 @@
 --source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
---disable_warnings
 --disable_query_log
 --connection master
-drop table if exists mysql.ndb_replication;
 CREATE TABLE mysql.ndb_replication
   (db VARBINARY(63),
    table_name VARBINARY(63),
@@ -18,8 +16,6 @@ CREATE TABLE mysql.ndb_replication
    conflict_fn VARBINARY(128),
    PRIMARY KEY USING HASH (db,table_name,server_id))
   ENGINE=NDB PARTITION BY KEY(db,table_name);
-drop table if exists `test`.`t1$EX`;
-drop table if exists `test`.`t2$EX`;
 create table `test`.`t1$EX`
   (server_id int unsigned,
    master_server_id int unsigned,
@@ -28,7 +24,6 @@ create table `test`.`t1$EX`
    a int not null,
    d varchar(9) not null,
    primary key(server_id, master_server_id, master_epoch, count)) engine ndb;
---enable_warnings
 --enable_query_log
 
 --echo *** Test 1 ********************************************************
@@ -78,3 +73,5 @@ drop table mysql.ndb_replication;
 drop table `test`.`t1$EX`;
 --sync_slave_with_master
 --enable_query_log
+
+--source include/master-slave-end.inc

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