bk commit into 6.0 tree (vvaintroub:1.2648)

[vvaintroub]

Below is the list of changes that have just been committed into a local
6.0 repository of vvaintroub.  When vvaintroub 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, 2008-04-25 13:38:04+02:00, vvaintroub@wva. +1 -0
  Changed 'Falcon' to $engine
  require falcon to run the test , as default storage engine
  MyISAM does not understand tablespaces 

  mysql-test/suite/falcon_team/t/falcon_bug_36294.test@stripped, 2008-04-25 13:38:02+02:00, vvaintroub@wva. +6 -3
    changed 'Falcon' to $engine,
    require falcon to run the test, as MyISAM does not support tablespaces

diff -Nrup a/mysql-test/suite/falcon_team/t/falcon_bug_36294.test b/mysql-test/suite/falcon_team/t/falcon_bug_36294.test
--- a/mysql-test/suite/falcon_team/t/falcon_bug_36294.test	2008-04-25 11:44:00 +02:00
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_36294.test	2008-04-25 13:38:02 +02:00
@@ -1,15 +1,18 @@
+--source include/have_falcon.inc
 #
 # Bug#36294:
 # this test produces no output. It is only here to crash the server
 # Once insert/select runs into error 305 (record memory exhaused)
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
 
 --disable_abort_on_error
 --disable_warnings
 --disable_query_log
 drop table if exists ftest;
-create tablespace gimdata add datafile 'gimdata.fts' engine=falcon;
-create table ftest (id serial, col1 varchar(500)) engine=falcon tablespace gimdata;
+create tablespace gimdata add datafile 'gimdata.fts' engine=$engine;
+create table ftest (id serial, col1 varchar(500)) engine=$engine tablespace gimdata;
 insert into ftest values (null,repeat("a",500));
 insert into ftest(col1) select col1 from ftest;
 insert into ftest(col1) select col1 from ftest;
@@ -34,7 +37,7 @@ insert into ftest(col1) select col1 from
 insert into ftest(col1) select col1 from ftest;
 insert into ftest(col1) select col1 from ftest;
 drop table ftest;
-drop tablespace gimdata engine=falcon;
+drop tablespace gimdata engine=$engine;
 --enable_warnings
 --enable_abort_on_error
 --enable_query_log