bzr commit into mysql-6.0-falcon branch (vvaintroub:2786)

[Vladislav Vaintroub]

#At file:///C:/bzr/mysql-6.0-falcon-team/

 2786 Vladislav Vaintroub	2008-08-15 [merge]
      merge
modified:
  mysql-test/include/have_falcon.inc

=== modified file 'mysql-test/include/have_falcon.inc'
--- a/mysql-test/include/have_falcon.inc	2008-03-30 13:57:32 +0000
+++ b/mysql-test/include/have_falcon.inc	2008-08-15 11:06:08 +0000
@@ -1,5 +1,18 @@
+##
+## Checks for the presence of the Falcon storage engine (plugin)
+## by querying the INFORMATION_SCHEMA.ENGINES table.
+##
+## If Falcon is not available, the test using this include file
+## is skipped.
+##
+
+# Do not echo these statements to test results
 --disable_query_log
-# Ignore errors when trying to install the Falcon plugin
---require r/true.require
-SELECT (support = 'YES' OR support = 'DEFAULT' OR support = 'ENABLED') AS `TRUE` FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE = 'Falcon';
+
+# Check if Falcon is available
+let $have_falcon = `SELECT (support = 'YES' OR support = 'DEFAULT' OR support = 'ENABLED') AS 'HAVE_FALCON' FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE = 'Falcon'`;
+if (!$have_falcon)
+{
+  skip Test needs the Falcon storage engine;
+}
 --enable_query_log