List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:May 9 2007 9:44pm
Subject:bk commit into 5.1 tree (jmiller:1.2532)
View as plain text  
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-05-09 23:44:48+02:00, jmiller@stripped +4 -0
  tpcb.inc, tpcb_DiskData.inc:
    Added disable warnings per tomas
  rpl_ndb_stm_innodb.result, rpl_ndb_mix_innodb.result:
    Updated results

  mysql-test/include/tpcb.inc@stripped, 2007-05-09 23:43:40+02:00, jmiller@stripped +2 -1
    Added disable warnings per tomas

  mysql-test/include/tpcb_DiskData.inc@stripped, 2007-05-09 23:44:37+02:00, jmiller@stripped +2 -2
    Added disable warnings per tomas

  mysql-test/r/rpl_ndb_mix_innodb.result@stripped, 2007-05-09 23:42:54+02:00, jmiller@stripped +1 -0
    Updated results

  mysql-test/r/rpl_ndb_stm_innodb.result@stripped, 2007-05-09 23:43:00+02:00, jmiller@stripped +1 -0
    Updated results

# 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.5/mysql-test/include/tpcb.inc	2007-05-09 23:44:59 +02:00
+++ 1.6/mysql-test/include/tpcb.inc	2007-05-09 23:44:59 +02:00
@@ -5,8 +5,9 @@
 #          stored procedures to load the database
 #          and run transactions against the DB
 ##################################################
+--disable_warnings
 DROP DATABASE IF EXISTS tpcb;
-
+--enable_warnings
 CREATE DATABASE tpcb;
 
 --echo

--- 1.6/mysql-test/include/tpcb_DiskData.inc	2007-05-09 23:44:59 +02:00
+++ 1.7/mysql-test/include/tpcb_DiskData.inc	2007-05-09 23:44:59 +02:00
@@ -5,9 +5,9 @@
 #          tables and stored procedures to load the database
 #          and run transactions against the DB
 ##################################################
-
+--disable_warnings
 DROP DATABASE IF EXISTS tpcb;
-
+--enable_warnings
 CREATE DATABASE tpcb;
 
 --echo

--- 1.1/mysql-test/r/rpl_ndb_mix_innodb.result	2007-05-09 23:44:59 +02:00
+++ 1.2/mysql-test/r/rpl_ndb_mix_innodb.result	2007-05-09 23:44:59 +02:00
@@ -56,6 +56,7 @@
 
 *** Test 2 ***
 
+DROP DATABASE IF EXISTS tpcb;
 CREATE DATABASE tpcb;
 
 CREATE TABLE tpcb.account (id INT, bid INT, balance DECIMAL(10,2),

--- 1.4/mysql-test/r/rpl_ndb_stm_innodb.result	2007-05-09 23:44:59 +02:00
+++ 1.5/mysql-test/r/rpl_ndb_stm_innodb.result	2007-05-09 23:44:59 +02:00
@@ -56,6 +56,7 @@
 
 *** Test 2 ***
 
+DROP DATABASE IF EXISTS tpcb;
 CREATE DATABASE tpcb;
 
 CREATE TABLE tpcb.account (id INT, bid INT, balance DECIMAL(10,2),
Thread
bk commit into 5.1 tree (jmiller:1.2532)Jonathan Miller9 May