From f574cd4e8f7f9794385cf5b9f6ddfc8530245005 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Sat, 28 Aug 2004 00:49:54 +0300
Subject: Code style fixes. Initialize LOG_error_log before get_options to not
 use an uninitalized mutex in case of an error from handle_options()

---
 mysql-test/r/lowercase_table.result | 21 ++++++++++++++++-----
 mysql-test/t/lowercase_table.test   | 17 ++++++++++++-----
 2 files changed, 28 insertions(+), 10 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/lowercase_table.result b/mysql-test/r/lowercase_table.result
index 5acab254511..43d24b1ab17 100644
--- a/mysql-test/r/lowercase_table.result
+++ b/mysql-test/r/lowercase_table.result
@@ -1,4 +1,5 @@
 drop table if exists t1,t2,t3,t4,T1;
+drop database if exists mysqltest;
 create table T1 (id int primary key, Word varchar(40) not null, Index(Word));
 create table t4 (id int primary key, Word varchar(40) not null);
 INSERT INTO T1 VALUES (1, 'a'), (2, 'b'), (3, 'c');
@@ -39,12 +40,22 @@ Unknown table 'T1' in field list
 select count(bags.a) from t1 as Bags;
 Unknown table 'bags' in field list
 drop table t1;
-create database foo;
-use foo;
+create database mysqltest;
+use MYSQLTEST;
 create table t1 (a int);
-select FOO.t1.* from FOO.t1;
+select T1.a from MYSQLTEST.T1;
+a
+select t1.a from MYSQLTEST.T1;
+Unknown table 't1' in field list
+select mysqltest.t1.* from MYSQLTEST.t1;
+a
+select MYSQLTEST.t1.* from MYSQLTEST.t1;
+a
+select MYSQLTEST.T1.* from MYSQLTEST.T1;
+a
+select MYSQLTEST.T1.* from T1;
 a
 alter table t1 rename to T1;
-select FOO.t1.* from FOO.t1;
+select MYSQLTEST.t1.* from MYSQLTEST.t1;
 a
-drop database FOO;
+drop database mysqltest;
diff --git a/mysql-test/t/lowercase_table.test b/mysql-test/t/lowercase_table.test
index d52c60baea7..1b431a9d920 100644
--- a/mysql-test/t/lowercase_table.test
+++ b/mysql-test/t/lowercase_table.test
@@ -3,6 +3,7 @@
 #
 
 drop table if exists t1,t2,t3,t4,T1;
+drop database if exists mysqltest;
 create table T1 (id int primary key, Word varchar(40) not null, Index(Word));
 create table t4 (id int primary key, Word varchar(40) not null);
 INSERT INTO T1 VALUES (1, 'a'), (2, 'b'), (3, 'c');
@@ -34,10 +35,16 @@ drop table t1;
 #
 # Test all caps database name
 #
-create database foo;
-use foo;
+create database mysqltest;
+use MYSQLTEST;
 create table t1 (a int);
-select FOO.t1.* from FOO.t1;
+select T1.a from MYSQLTEST.T1;
+--error 1109
+select t1.a from MYSQLTEST.T1;
+select mysqltest.t1.* from MYSQLTEST.t1;
+select MYSQLTEST.t1.* from MYSQLTEST.t1;
+select MYSQLTEST.T1.* from MYSQLTEST.T1;
+select MYSQLTEST.T1.* from T1;
 alter table t1 rename to T1;
-select FOO.t1.* from FOO.t1;
-drop database FOO;
+select MYSQLTEST.t1.* from MYSQLTEST.t1;
+drop database mysqltest;
-- 
cgit v1.2.1


From 9632f7d9c808bc6ab0b27d8bfaa3b5b0981e7dfa Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Mon, 30 Aug 2004 09:20:52 +0200
Subject:  - removed mysql-test/t/flush_block_commit-master.opt as it collided 
   with the sleep value we use for the test suite run during the    release
 builds

---
 mysql-test/t/flush_block_commit-master.opt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 mysql-test/t/flush_block_commit-master.opt

(limited to 'mysql-test')

diff --git a/mysql-test/t/flush_block_commit-master.opt b/mysql-test/t/flush_block_commit-master.opt
deleted file mode 100644
index d1f6d58e9f7..00000000000
--- a/mysql-test/t/flush_block_commit-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb_lock_wait_timeout=5
-- 
cgit v1.2.1