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

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


include/my_global.h:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Merge

1 files changed, 0 insertions, 15 deletions

diff --git a/mysql-test/r/ndb_autodiscover.result b/mysql-test/r/ndb_autodiscover.result
index babe3d0fe41..3834c283a1e 100644
--- a/mysql-test/r/ndb_autodiscover.result
+++ b/mysql-test/r/ndb_autodiscover.result
@@ -372,7 +372,6 @@ drop table t1;
 use test2;
 drop table t2;
 drop database test2;
-use test;
 drop database if exists test_only_ndb_tables;
 create database test_only_ndb_tables;
 use test_only_ndb_tables;
@@ -383,20 +382,6 @@ select * from t1;
 ERROR HY000: Can't lock file (errno: 4009)
 use test;
 drop database test_only_ndb_tables;
-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