Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1

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

mysql-test/r/ndb_autodiscover.result

@@ -358,20 +358,6 @@ Database
 mysql
 test
 use test;
-CREATE TABLE sys.SYSTAB_0 (a int);
-ERROR 42S01: Table 'SYSTAB_0' already exists
-select * from sys.SYSTAB_0;
-ERROR HY000: Failed to open 'SYSTAB_0', error while unpacking from engine
-CREATE TABLE IF NOT EXISTS sys.SYSTAB_0 (a int);
-show warnings;
-Level	Code	Message
-select * from sys.SYSTAB_0;
-ERROR HY000: Failed to open 'SYSTAB_0', error while unpacking from engine
-drop table sys.SYSTAB_0;
-ERROR 42S02: Unknown table 'SYSTAB_0'
-drop table IF EXISTS sys.SYSTAB_0;
-Warnings:
-Note	1051	Unknown table 'SYSTAB_0'
 CREATE TABLE t9 (
 a int NOT NULL PRIMARY KEY,
 b int

mysql-test/t/ndb_autodiscover.test

@@ -460,19 +460,20 @@ use test;
 # 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