From b913b2e7c29ef8847ec53b571db12684becc5cfd Mon Sep 17 00:00:00 2001
From: "jmiller/ndbdev@mysql.com/ndb08.mysql.com" <>
Date: Thu, 4 Jan 2007 04:09:06 +0100
Subject: [PATCH] Many files:   Updated from Tomas review

---
 mysql-test/r/rpl_ndb_do_db.result      | 2 --
 mysql-test/r/rpl_ndb_do_table.result   | 3 ---
 mysql-test/r/rpl_ndb_rep_ignore.result | 2 --
 mysql-test/t/rpl_ndb_do_db.test        | 2 ++
 mysql-test/t/rpl_ndb_do_table.test     | 3 ++-
 mysql-test/t/rpl_ndb_rep_ignore.test   | 2 ++
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/rpl_ndb_do_db.result b/mysql-test/r/rpl_ndb_do_db.result
index 32f25d5f5a4..316f5fc7e31 100644
--- a/mysql-test/r/rpl_ndb_do_db.result
+++ b/mysql-test/r/rpl_ndb_do_db.result
@@ -5,8 +5,6 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 DROP DATABASE IF EXISTS replica;
-Warnings:
-Note	1008	Can't drop database 'replica'; database doesn't exist
 CREATE DATABASE replica;
 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;
diff --git a/mysql-test/r/rpl_ndb_do_table.result b/mysql-test/r/rpl_ndb_do_table.result
index 761c7837fde..a5854985352 100644
--- a/mysql-test/r/rpl_ndb_do_table.result
+++ b/mysql-test/r/rpl_ndb_do_table.result
@@ -5,9 +5,6 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 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 t2 (a INT NOT NULL KEY, b text NOT NULL)ENGINE=NDB;
 INSERT INTO t1 VALUES(1, repeat('abc',10));
diff --git a/mysql-test/r/rpl_ndb_rep_ignore.result b/mysql-test/r/rpl_ndb_rep_ignore.result
index 45d9e5db857..4e28a7e5865 100644
--- a/mysql-test/r/rpl_ndb_rep_ignore.result
+++ b/mysql-test/r/rpl_ndb_rep_ignore.result
@@ -5,8 +5,6 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 DROP DATABASE IF EXISTS replica;
-Warnings:
-Note	1008	Can't drop database 'replica'; database doesn't exist
 CREATE DATABASE replica;
 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;
diff --git a/mysql-test/t/rpl_ndb_do_db.test b/mysql-test/t/rpl_ndb_do_db.test
index 52c638261bf..9b65d43f244 100644
--- a/mysql-test/t/rpl_ndb_do_db.test
+++ b/mysql-test/t/rpl_ndb_do_db.test
@@ -9,7 +9,9 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
+--disable_warnings
 DROP DATABASE IF EXISTS replica;
+--enable_warnings
 
 # Create database and tables for the test.
 CREATE DATABASE replica;
diff --git a/mysql-test/t/rpl_ndb_do_table.test b/mysql-test/t/rpl_ndb_do_table.test
index 8cc34a6ba5c..278a326aefd 100644
--- a/mysql-test/t/rpl_ndb_do_table.test
+++ b/mysql-test/t/rpl_ndb_do_table.test
@@ -9,8 +9,9 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
+--disable_warnings
 DROP TABLE IF EXISTS t1, t2;
-
+--enable_warnings
 
 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;
diff --git a/mysql-test/t/rpl_ndb_rep_ignore.test b/mysql-test/t/rpl_ndb_rep_ignore.test
index 14a583eac8e..47f5bce5527 100644
--- a/mysql-test/t/rpl_ndb_rep_ignore.test
+++ b/mysql-test/t/rpl_ndb_rep_ignore.test
@@ -10,7 +10,9 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
+--disable_warnings
 DROP DATABASE IF EXISTS replica;
+--enable_warnings
 
 # Create database and tables for the test.
 CREATE DATABASE replica;