bk commit into 6.0 tree (hakank:1.2614)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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-10-03 07:22:49+02:00, hakank@lu0011.(none) +3 -0
  In case of a given storage engine is not compiled in
  a -master.opt file with that storage engine does
  not really work.
  
  This fixes test failures on platforms where Falcon
  is not compiled.

  mysql-test/suite/falcon/r/falcon_bug_28095_II.result@stripped, 2007-10-03 07:22:45+02:00,
hakank@lu0011.(none) +1 -0
    Setting default storage engine to Falcon.

  mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt@stripped, 2007-10-03 07:22:45+02:00,
hakank@lu0011.(none) +1 -1
    In case of a given storage engine is not compiled in
    a -master.opt file with that storage engine does
    not really work.

  mysql-test/suite/falcon/t/falcon_bug_28095_II.test@stripped, 2007-10-03 07:22:45+02:00,
hakank@lu0011.(none) +2 -0
    Setting default storage engine to Falcon.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_28095_II.result
b/mysql-test/suite/falcon/r/falcon_bug_28095_II.result
--- a/mysql-test/suite/falcon/r/falcon_bug_28095_II.result	2007-09-20 17:43:15 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_28095_II.result	2007-10-03 07:22:45 +02:00
@@ -1,5 +1,6 @@
 *** Bug #126: Second phase ***
 *** Also test for bug #123 ***
+SET @@storage_engine = Falcon;
 SELECT * FROM t1;
 a
 1
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt
b/mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt
--- a/mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt	2007-09-20 17:43:40 +02:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095_II-master.opt	2007-10-03 07:22:45 +02:00
@@ -1 +1 @@
---default-storage-engine=Falcon
+--sql_mode=''
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_28095_II.test
b/mysql-test/suite/falcon/t/falcon_bug_28095_II.test
--- a/mysql-test/suite/falcon/t/falcon_bug_28095_II.test	2007-09-29 06:30:37 +02:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095_II.test	2007-10-03 07:22:45 +02:00
@@ -5,5 +5,7 @@
 #
 --echo *** Bug #126: Second phase ***
 --echo *** Also test for bug #123 ***
+SET @@storage_engine = Falcon;
+
 SELECT * FROM t1;
 DROP TABLE t1, t2;