bk commit into 5.1 tree (msvensson:1.2374) BUG#24997

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-15 15:04:46+01:00, msvensson@neptunus.(none) +4 -0
  Bug#24997 warnings test case failure
   - Move the specific test case to a separate file that is run only
     if we have a disabled handler.

  mysql-test/r/warnings.result@stripped, 2006-12-15 15:04:34+01:00, msvensson@neptunus.(none)
+0 -7
    Move the test for warning that table type is changed to separate file
    as it only occurs when engine is disabled.

  mysql-test/r/warnings_engine_disabled.result@stripped, 2006-12-15 15:04:42+01:00,
msvensson@neptunus.(none) +7 -0
    Move the test for warning that table type is changed to separate file
    as it only occurs when engine is disabled.

  mysql-test/r/warnings_engine_disabled.result@stripped, 2006-12-15 15:04:42+01:00,
msvensson@neptunus.(none) +0 -0

  mysql-test/t/warnings.test@stripped, 2006-12-15 15:04:34+01:00, msvensson@neptunus.(none) +0
-6
    Move the test for warning that table type is changed to separate file
    as it only occurs when engine is disabled.

  mysql-test/t/warnings_engine_disabled.test@stripped, 2006-12-15 15:04:42+01:00,
msvensson@neptunus.(none) +19 -0
    Move the test for warning that table type is changed to separate file
    as it only occurs when engine is disabled.

  mysql-test/t/warnings_engine_disabled.test@stripped, 2006-12-15 15:04:42+01:00,
msvensson@neptunus.(none) +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-maint

--- 1.29/mysql-test/t/warnings.test	2006-12-15 15:04:53 +01:00
+++ 1.30/mysql-test/t/warnings.test	2006-12-15 15:04:53 +01:00
@@ -109,12 +109,6 @@ show variables like 'max_error_count';
 set max_error_count=10;
 show variables like 'max_error_count';
 
-#
-# Test for handler type
-#
-drop table t1;
-create table t1 (id int) engine=NDB;
-alter table t1 engine=NDB;
 drop table t1;
 
 #
--- New file ---
+++ mysql-test/r/warnings_engine_disabled.result	06/12/15 15:04:42
create table t1 (id int) engine=NDB;
Warnings:
Warning	1266	Using storage engine MyISAM for table 't1'
alter table t1 engine=NDB;
Warnings:
Warning	1266	Using storage engine MyISAM for table 't1'
drop table t1;

--- New file ---
+++ mysql-test/t/warnings_engine_disabled.test	06/12/15 15:04:42
#
# Only run this test with a compiled in but disabled
# engine
#
disable_query_log;
--require r/true.require
select support = 'Disabled' as `TRUE` from information_schema.engines where engine =
'ndbcluster';
enable_query_log;


#
# Test for handler type, will select MyISAM and print a warning
# about that - since NDB is disabled
#
create table t1 (id int) engine=NDB;
alter table t1 engine=NDB;
drop table t1;




--- 1.54/mysql-test/r/warnings.result	2006-12-15 15:04:53 +01:00
+++ 1.55/mysql-test/r/warnings.result	2006-12-15 15:04:53 +01:00
@@ -166,13 +166,6 @@ show variables like 'max_error_count';
 Variable_name	Value
 max_error_count	10
 drop table t1;
-create table t1 (id int) engine=NDB;
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
-alter table t1 engine=NDB;
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't1'
-drop table t1;
 set table_type=MYISAM;
 Warnings:
 Warning	1541	The syntax 'table_type' is deprecated and will be removed in MySQL 5.2.
Please use 'storage_engine' instead