summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-05-24 01:09:23 +0200
committerunknown <lars@mysql.com>2005-05-24 01:09:23 +0200
commitb36f9f2eeded87ee629619f0c35840f3bec10013 (patch)
treea317cae0f94ff915ab5ccd337345a22c1c5d62af /mysql-test
parentd81bee6ec10ae527667d54b334644f767c6cae01 (diff)
parentb6c1f2302ab77e6cfd37bd05f8444ff0c82bc459 (diff)
downloadmariadb-git-b36f9f2eeded87ee629619f0c35840f3bec10013.tar.gz
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/lowercase_table.result6
-rw-r--r--mysql-test/t/lowercase_table.test11
-rw-r--r--mysql-test/t/reserved_win_names-master.opt1
3 files changed, 17 insertions, 1 deletions
diff --git a/mysql-test/r/lowercase_table.result b/mysql-test/r/lowercase_table.result
index ef379cebaa9..499f46a237e 100644
--- a/mysql-test/r/lowercase_table.result
+++ b/mysql-test/r/lowercase_table.result
@@ -83,3 +83,9 @@ create table t2 like T1;
drop table t1, t2;
show tables;
Tables_in_test
+use lpt1;
+ERROR 42000: Unknown database 'lpt1'
+use com1;
+ERROR 42000: Unknown database 'com1'
+use prn;
+ERROR 42000: Unknown database 'prn'
diff --git a/mysql-test/t/lowercase_table.test b/mysql-test/t/lowercase_table.test
index ee8dc403981..ca81c7c66bc 100644
--- a/mysql-test/t/lowercase_table.test
+++ b/mysql-test/t/lowercase_table.test
@@ -82,3 +82,14 @@ create table t2 like T1;
drop table t1, t2;
show tables;
+
+#
+#Bug 9148: Denial of service
+#
+--error 1049
+use lpt1;
+--error 1049
+use com1;
+--error 1049
+use prn;
+
diff --git a/mysql-test/t/reserved_win_names-master.opt b/mysql-test/t/reserved_win_names-master.opt
deleted file mode 100644
index 62ab6dad1e0..00000000000
--- a/mysql-test/t/reserved_win_names-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---lower_case_table_names=1