From cb188a89c1d94ab6b140ba62c5b7848d28e9eb31 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Sun, 27 Jun 2004 13:16:19 +0200
Subject: [PATCH] after merge fix

---
 mysql-test/r/lowercase_table2.result | 4 ++--
 mysql-test/r/lowercase_table3.result | 4 ++--
 mysql-test/t/lowercase_table3.test   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/r/lowercase_table2.result
index 7e6c244bcd8..3be73f6cc6a 100644
--- a/mysql-test/r/lowercase_table2.result
+++ b/mysql-test/r/lowercase_table2.result
@@ -32,7 +32,7 @@ T1
 ALTER TABLE T1 add b int;
 SHOW TABLES LIKE "T1";
 Tables_in_test (T1)
-t1
+T1
 ALTER TABLE T1 RENAME T2;
 SHOW TABLES LIKE "T2";
 Tables_in_test (T2)
@@ -41,7 +41,7 @@ LOCK TABLE T2 WRITE;
 ALTER TABLE T2 drop b;
 SHOW TABLES LIKE "T2";
 Tables_in_test (T2)
-t2
+T2
 UNLOCK TABLES;
 RENAME TABLE T2 TO T1;
 SHOW TABLES LIKE "T1";
diff --git a/mysql-test/r/lowercase_table3.result b/mysql-test/r/lowercase_table3.result
index 362d17e0461..ecb785f243f 100644
--- a/mysql-test/r/lowercase_table3.result
+++ b/mysql-test/r/lowercase_table3.result
@@ -4,7 +4,7 @@ SELECT * from T1;
 a
 drop table t1;
 flush tables;
-CREATE TABLE t1 (a int) type=INNODB;
+CREATE TABLE t1 (a int) ENGINE=INNODB;
 SELECT * from T1;
-Can't open file: 'T1.InnoDB'. (errno: 1)
+ERROR HY000: Can't open file: 'T1.InnoDB'. (errno: 1)
 drop table t1;
diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test
index edb852a9fb7..a394cde7237 100644
--- a/mysql-test/t/lowercase_table3.test
+++ b/mysql-test/t/lowercase_table3.test
@@ -31,7 +31,7 @@ flush tables;
 # storing things in lower case.
 #
 
-CREATE TABLE t1 (a int) type=INNODB;
+CREATE TABLE t1 (a int) ENGINE=INNODB;
 --error 1016
 SELECT * from T1;
 drop table t1;