bk commit into 5.1 tree (msvensson:1.2544)

[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, 2007-12-05 12:18:22+01:00, msvensson@stripped +1 -0
  Improve check for "disabled ndbcluster handler" to ouptu a proper skip message

  mysql-test/t/warnings_engine_disabled.test@stripped, 2007-12-05 12:18:20+01:00, msvensson@stripped +4 -5
    Improve check for "disabled ndbcluster handler" to ouptu a proper skip message

diff -Nrup a/mysql-test/t/warnings_engine_disabled.test b/mysql-test/t/warnings_engine_disabled.test
--- a/mysql-test/t/warnings_engine_disabled.test	2006-12-15 15:05:48 +01:00
+++ b/mysql-test/t/warnings_engine_disabled.test	2007-12-05 12:18:20 +01:00
@@ -2,11 +2,10 @@
 # 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;
-
+if (!`select support = 'Disabled' as 'TRUE'
+      from information_schema.engines where engine = 'ndbcluster'`){
+  skip Need disabled ndbcluster handler;
+}
 
 #
 # Test for handler type, will select MyISAM and print a warning