summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-08-02 15:58:41 -0700
committerjimw@mysql.com <>2005-08-02 15:58:41 -0700
commit71a0d0ad4cfcfda9bec6a429b403aaf88c9d6d2e (patch)
tree2e8c6b261ce0d1bf101d1d39687c783eacb2e2eb
parent2889025accafd9f7a5c7b2788b9e34f31dc257e4 (diff)
downloadmariadb-git-71a0d0ad4cfcfda9bec6a429b403aaf88c9d6d2e.tar.gz
Make lowercase_table3 get skipped on Windows, as intended. (Bug #11568)
-rw-r--r--mysql-test/include/have_lowercase0.inc4
-rw-r--r--mysql-test/include/not_windows.inc4
-rw-r--r--mysql-test/t/lowercase_table3.test8
3 files changed, 10 insertions, 6 deletions
diff --git a/mysql-test/include/have_lowercase0.inc b/mysql-test/include/have_lowercase0.inc
new file mode 100644
index 00000000000..f967c18928b
--- /dev/null
+++ b/mysql-test/include/have_lowercase0.inc
@@ -0,0 +1,4 @@
+--require r/lowercase0.require
+--disable_query_log;
+show variables like "lower_case_%";
+--enable_query_log;
diff --git a/mysql-test/include/not_windows.inc b/mysql-test/include/not_windows.inc
new file mode 100644
index 00000000000..0db231ddb81
--- /dev/null
+++ b/mysql-test/include/not_windows.inc
@@ -0,0 +1,4 @@
+--require r/true.require
+--disable_query_log;
+select convert(@@version_compile_os using latin1) NOT IN ("Win32","Win64","Windows") as "TRUE";
+--enable_query_log;
diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test
index 7d34ba649cf..75f6e5188c5 100644
--- a/mysql-test/t/lowercase_table3.test
+++ b/mysql-test/t/lowercase_table3.test
@@ -5,12 +5,8 @@
#
--source include/have_innodb.inc
---require r/lowercase0.require
-disable_query_log;
-show variables like "lower_case_%";
---require r/true.require
-select convert(@@version_compile_os using latin1) NOT IN ("NT","WIN2000","Win95/Win98","XP") as "TRUE";
-enable_query_log;
+--source include/have_lowercase0.inc
+--source include/not_windows.inc
--disable_warnings
DROP TABLE IF EXISTS t1,T1;