bk commit into 5.1 tree (jmiller:1.2520)

[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-06-07 16:46:02+02:00, jmiller@stripped +3 -0
  tpcb_disk_data.inc:
    Rename: mysql-test/include/tpcb_DiskData.inc -> mysql-test/include/tpcb_disk_data.inc
  rpl_ndb_dd_advance.test:
    Updated include name to remove caps as suggested by tomas
  rpl_ndb_dd_advance.result:
    updated results file

  mysql-test/include/tpcb_disk_data.inc@stripped, 2007-06-06 16:40:16+02:00, jmiller@stripped +0 -0
    Rename: mysql-test/include/tpcb_DiskData.inc -> mysql-test/include/tpcb_disk_data.inc

  mysql-test/r/rpl_ndb_dd_advance.result@stripped, 2007-06-07 13:44:05+02:00, jmiller@stripped +0 -2
    updated results file

  mysql-test/t/rpl_ndb_dd_advance.test@stripped, 2007-06-06 16:45:51+02:00, jmiller@stripped +1 -1
    Updated include name to remove caps as suggested by tomas

# 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:	/data1/mysql-5.1-telco

--- 1.11/mysql-test/r/rpl_ndb_dd_advance.result	2007-06-07 16:46:13 +02:00
+++ 1.12/mysql-test/r/rpl_ndb_dd_advance.result	2007-06-07 16:46:13 +02:00
@@ -188,8 +188,6 @@
 INITIAL_SIZE 5M
 ENGINE=NDB;
 DROP DATABASE IF EXISTS tpcb;
-Warnings:
-Note	1008	Can't drop database 'tpcb'; database doesn't exist
 CREATE DATABASE tpcb;
 
 CREATE TABLE tpcb.account

--- 1.13/mysql-test/t/rpl_ndb_dd_advance.test	2007-06-07 16:46:13 +02:00
+++ 1.14/mysql-test/t/rpl_ndb_dd_advance.test	2007-06-07 16:46:13 +02:00
@@ -210,7 +210,7 @@
 let table_space=ts2;
 let format='RBR';
 
---source include/tpcb_DiskData.inc
+--source include/tpcb_disk_data.inc
 
 --echo ****** TEST 2 test time *********************************
 USE tpcb;