bk commit into 5.1 tree (jmiller:1.2373)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-04 04:09:06+01:00, jmiller@stripped +6 -0
  Many files:
    Updated from Tomas review

  mysql-test/r/rpl_ndb_do_db.result@stripped, 2007-01-04 04:08:31+01:00, jmiller@stripped +0 -2
    Updated from Tomas review

  mysql-test/r/rpl_ndb_do_table.result@stripped, 2007-01-04 04:08:31+01:00, jmiller@stripped +0 -3
    Updated from Tomas review

  mysql-test/r/rpl_ndb_rep_ignore.result@stripped, 2007-01-04 04:08:42+01:00, jmiller@stripped +0 -2
    Updated from Tomas review

  mysql-test/t/rpl_ndb_do_db.test@stripped, 2007-01-04 04:08:22+01:00, jmiller@stripped +2 -0
    Updated from Tomas review

  mysql-test/t/rpl_ndb_do_table.test@stripped, 2007-01-04 04:08:22+01:00, jmiller@stripped +2 -1
    Updated from Tomas review

  mysql-test/t/rpl_ndb_rep_ignore.test@stripped, 2007-01-04 04:08:52+01:00, jmiller@stripped +2 -0
    Updated from Tomas review

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jmiller
# Host:	ndb08.mysql.com
# Root:	/data2/mysql-5.1-new-ndb

--- 1.1/mysql-test/r/rpl_ndb_do_db.result	2007-01-04 04:09:16 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_do_db.result	2007-01-04 04:09:16 +01:00
@@ -5,8 +5,6 @@
 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;

--- 1.1/mysql-test/r/rpl_ndb_do_table.result	2007-01-04 04:09:16 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_do_table.result	2007-01-04 04:09:16 +01:00
@@ -5,9 +5,6 @@
 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));

--- 1.1/mysql-test/r/rpl_ndb_rep_ignore.result	2007-01-04 04:09:16 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_rep_ignore.result	2007-01-04 04:09:16 +01:00
@@ -5,8 +5,6 @@
 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;

--- 1.1/mysql-test/t/rpl_ndb_do_db.test	2007-01-04 04:09:16 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_do_db.test	2007-01-04 04:09:16 +01:00
@@ -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;

--- 1.1/mysql-test/t/rpl_ndb_do_table.test	2007-01-04 04:09:16 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_do_table.test	2007-01-04 04:09:16 +01:00
@@ -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;

--- 1.1/mysql-test/t/rpl_ndb_rep_ignore.test	2007-01-04 04:09:17 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_rep_ignore.test	2007-01-04 04:09:17 +01:00
@@ -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;