bk commit into 5.0 tree (msvensson:1.2598)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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-04 16:36:25+01:00, msvensson@stripped +3 -0
  Put everything needed to test exampledb in one file

  BitKeeper/deleted/.del-have_exampledb.inc@stripped, 2007-12-04 16:29:41+01:00, msvensson@stripped +0 -0
    Delete: mysql-test/include/have_exampledb.inc

  BitKeeper/deleted/.del-have_exampledb.require@stripped, 2007-12-04 16:29:47+01:00, msvensson@stripped +0 -0
    Delete: mysql-test/r/have_exampledb.require

  mysql-test/t/exampledb.test@stripped, 2007-12-04 16:36:23+01:00, msvensson@stripped +6 -1
    Put everything needed to test exampledb in one file

diff -Nrup a/mysql-test/include/have_exampledb.inc b/mysql-test/include/have_exampledb.inc
--- a/mysql-test/include/have_exampledb.inc	2004-08-14 02:13:31 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,4 +0,0 @@
--- require r/have_exampledb.require
-disable_query_log;
-show variables like "have_example_engine";
-enable_query_log;
diff -Nrup a/mysql-test/r/have_exampledb.require b/mysql-test/r/have_exampledb.require
--- a/mysql-test/r/have_exampledb.require	2004-12-07 01:25:59 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,2 +0,0 @@
-Variable_name	Value
-have_example_engine	YES
diff -Nrup a/mysql-test/t/exampledb.test b/mysql-test/t/exampledb.test
--- a/mysql-test/t/exampledb.test	2005-07-28 02:21:41 +02:00
+++ b/mysql-test/t/exampledb.test	2007-12-04 16:36:23 +01:00
@@ -2,7 +2,12 @@
 # Simple test for the example storage engine
 # Taken fromm the select test
 #
--- source include/have_exampledb.inc
+
+let $have_example=
+    query_get_value(show variables like "have_example_engine", Value, 1);
+if (`select '$have_example' != 'YES'`){
+  skip Need example engine;
+}
 
 --disable_warnings
 drop table if exists t1;