Commit f0cd7348 authored by unknown's avatar unknown

Many files:

  Updated from Tomas review


mysql-test/t/rpl_ndb_do_db.test:
  Updated from Tomas review
mysql-test/t/rpl_ndb_do_table.test:
  Updated from Tomas review
mysql-test/r/rpl_ndb_do_db.result:
  Updated from Tomas review
mysql-test/r/rpl_ndb_do_table.result:
  Updated from Tomas review
mysql-test/r/rpl_ndb_rep_ignore.result:
  Updated from Tomas review
mysql-test/t/rpl_ndb_rep_ignore.test:
  Updated from Tomas review
parent e823ca5b
...@@ -5,8 +5,6 @@ reset slave; ...@@ -5,8 +5,6 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
DROP DATABASE IF EXISTS replica; DROP DATABASE IF EXISTS replica;
Warnings:
Note 1008 Can't drop database 'replica'; database doesn't exist
CREATE DATABASE replica; CREATE DATABASE replica;
CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB; CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB; CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
......
...@@ -5,9 +5,6 @@ reset slave; ...@@ -5,9 +5,6 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
DROP TABLE IF EXISTS t1, t2; DROP TABLE IF EXISTS t1, t2;
Warnings:
Note 1051 Unknown table 't1'
Note 1051 Unknown table 't2'
CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB; CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB; CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
INSERT INTO t1 VALUES(1, repeat('abc',10)); INSERT INTO t1 VALUES(1, repeat('abc',10));
......
...@@ -5,8 +5,6 @@ reset slave; ...@@ -5,8 +5,6 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
DROP DATABASE IF EXISTS replica; DROP DATABASE IF EXISTS replica;
Warnings:
Note 1008 Can't drop database 'replica'; database doesn't exist
CREATE DATABASE replica; CREATE DATABASE replica;
CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB; CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB; CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
--source include/master-slave.inc --source include/master-slave.inc
--disable_warnings
DROP DATABASE IF EXISTS replica; DROP DATABASE IF EXISTS replica;
--enable_warnings
# Create database and tables for the test. # Create database and tables for the test.
CREATE DATABASE replica; CREATE DATABASE replica;
......
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
--source include/master-slave.inc --source include/master-slave.inc
--disable_warnings
DROP TABLE IF EXISTS t1, t2; DROP TABLE IF EXISTS t1, t2;
--enable_warnings
CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB; CREATE TABLE t1 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB; CREATE TABLE t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
......
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
--source include/master-slave.inc --source include/master-slave.inc
--disable_warnings
DROP DATABASE IF EXISTS replica; DROP DATABASE IF EXISTS replica;
--enable_warnings
# Create database and tables for the test. # Create database and tables for the test.
CREATE DATABASE replica; CREATE DATABASE replica;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment