From 64e19595981611d1e39bbdba2fb3d91a15507db6 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Mar 2011 11:15:55 -0600 Subject: [PATCH] Bug#60196 / Bug#11831040 Test case cannot run on embedded server. No need for precautionary cleanup of unique names. --- .../suite/innodb/r/innodb_bug60196.result | 11 ++++----- .../suite/innodb/t/innodb_bug60196.test | 24 +++++++------------ 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb_bug60196.result b/mysql-test/suite/innodb/r/innodb_bug60196.result index 296c5ce7e1d..85707f81a28 100755 --- a/mysql-test/suite/innodb/r/innodb_bug60196.result +++ b/mysql-test/suite/innodb/r/innodb_bug60196.result @@ -1,9 +1,6 @@ -DROP TABLE IF EXISTS Bug_60196_FK1 ; -DROP TABLE IF EXISTS Bug_60196_FK2 ; -DROP TABLE IF EXISTS Bug_60196 ; -CREATE TABLE `Bug_60196_FK1` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE `Bug_60196_FK2` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE `Bug_60196` ( +CREATE TABLE Bug_60196_FK1 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE Bug_60196_FK2 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE Bug_60196 ( FK1_Key INT NOT NULL, FK2_Key INT NOT NULL, PRIMARY KEY (FK2_Key, FK1_Key), @@ -46,7 +43,7 @@ FK1_Key FK2_Key 1 1 1 2 1 3 -# Stop master server +# Stop server # Restart server. # # Try to insert more to the example table with foreign keys. diff --git a/mysql-test/suite/innodb/t/innodb_bug60196.test b/mysql-test/suite/innodb/t/innodb_bug60196.test index 6d77baf8d6c..47c646a5a75 100755 --- a/mysql-test/suite/innodb/t/innodb_bug60196.test +++ b/mysql-test/suite/innodb/t/innodb_bug60196.test @@ -1,26 +1,20 @@ # Bug#60196 - Setting lowercase_table_names to 2 on Windows causing # Foreign Key problems after an engine is restarted. -# This test case needs InnoDB. ---source include/have_innodb.inc +# This test case needs InnoDB, a lowercase file system, +# lower-case-table-names=2, and cannot use the embedded server +# because it restarts the server. +--source include/not_embedded.inc --source include/have_lowercase2.inc --source include/have_case_insensitive_file_system.inc - -# -# Precautionary clean up. -# ---disable_warnings -DROP TABLE IF EXISTS Bug_60196_FK1 ; -DROP TABLE IF EXISTS Bug_60196_FK2 ; -DROP TABLE IF EXISTS Bug_60196 ; ---enable_warnings +--source include/have_innodb.inc # # Create test data. # -CREATE TABLE `Bug_60196_FK1` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE `Bug_60196_FK2` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE `Bug_60196` ( +CREATE TABLE Bug_60196_FK1 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE Bug_60196_FK2 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE Bug_60196 ( FK1_Key INT NOT NULL, FK2_Key INT NOT NULL, PRIMARY KEY (FK2_Key, FK1_Key), @@ -49,7 +43,7 @@ SELECT * FROM bug_60196_FK1; SELECT * FROM bug_60196_FK2; SELECT * FROM bug_60196; ---echo # Stop master server +--echo # Stop server # Write file to make mysql-test-run.pl wait for the server to stop -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect