Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

1 files changed, 14 insertions, 13 deletions

diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test
index 079ebd09ae1..c2068329d41 100644
--- a/mysql-test/t/ndb_autodiscover.test
+++ b/mysql-test/t/ndb_autodiscover.test
@@ -501,19 +501,20 @@ drop database test_only_ndb_tables;
 # a table with tha same name as a table that can't be
 # discovered( for example a table created via NDBAPI)
 
---error 1050
-CREATE TABLE sys.SYSTAB_0 (a int);
---error 1105
-select * from sys.SYSTAB_0;
-
-CREATE TABLE IF NOT EXISTS sys.SYSTAB_0 (a int);
-show warnings;
---error 1105
-select * from sys.SYSTAB_0;
-
---error 1051
-drop table sys.SYSTAB_0;
-drop table IF EXISTS sys.SYSTAB_0;
+# Test disabled since it doesn't work on case insensitive systems
+#--error 1050
+#CREATE TABLE sys.SYSTAB_0 (a int);
+#--error 1105
+#select * from sys.SYSTAB_0;
+
+#CREATE TABLE IF NOT EXISTS sys.SYSTAB_0 (a int);
+#show warnings;
+#--error 1105
+#select * from sys.SYSTAB_0;
+
+#--error 1051
+#drop table sys.SYSTAB_0;
+#drop table IF EXISTS sys.SYSTAB_0;
 
 ######################################################
 # Note! This should always be the last step in this