bk commit into 6.0 tree (hakank:1.2641)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank 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-14 23:30:15+02:00, hakank@lu0011.(none) +6 -0
  Started splitting falcon_ts.test into several small tests
  for better maintainability.

  mysql-test/suite/falcon/r/falcon_bug_31110.result@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +6 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_31110.result''

  mysql-test/suite/falcon/r/falcon_bug_31110.result@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/r/falcon_bug_31114.result@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +8 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_31114.result''

  mysql-test/suite/falcon/r/falcon_bug_31114.result@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/r/falcon_bug_31296.result@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +8 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_31296.result''

  mysql-test/suite/falcon/r/falcon_bug_31296.result@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/t/falcon_bug_31110.test@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +36 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_31110.test''

  mysql-test/suite/falcon/t/falcon_bug_31110.test@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/t/falcon_bug_31114.test@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +37 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_31114.test''

  mysql-test/suite/falcon/t/falcon_bug_31114.test@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/t/falcon_bug_31296.test@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +36 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_31296.test''

  mysql-test/suite/falcon/t/falcon_bug_31296.test@stripped, 2008-04-14 23:30:14+02:00,
hakank@lu0011.(none) +0 -0

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_31110.result
b/mysql-test/suite/falcon/r/falcon_bug_31110.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_31110.result	2008-04-14 23:30:14 +02:00
@@ -0,0 +1,6 @@
+*** Bug #31110 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+DROP TABLESPACE ts1 ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=MyISAM;
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE
or LOGFILE GROUP'
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_31114.result
b/mysql-test/suite/falcon/r/falcon_bug_31114.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_31114.result	2008-04-14 23:30:14 +02:00
@@ -0,0 +1,8 @@
+*** Bug #31114 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+DROP TABLESPACE ts1 ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts2.fts' ENGINE=falcon;
+ERROR HY000: Tablespace 'ts1' already exists
+DROP TABLESPACE ts1 ENGINE=falcon;
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_31296.result
b/mysql-test/suite/falcon/r/falcon_bug_31296.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_31296.result	2008-04-14 23:30:14 +02:00
@@ -0,0 +1,8 @@
+*** Bug #31296 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+DROP TABLESPACE ts1 ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+DROP TABLESPACE ts1 ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+DROP TABLESPACE ts1 ENGINE=falcon;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_31110.test
b/mysql-test/suite/falcon/t/falcon_bug_31110.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_31110.test	2008-04-14 23:30:14 +02:00
@@ -0,0 +1,36 @@
+--source include/have_falcon.inc
+#
+# Bug #31110: falcon: missing engine check while dropping tablespace
+#
+--echo *** Bug #31110 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--error 0,ER_NO_SUCH_TABLESPACE
+DROP TABLESPACE ts1 ENGINE=falcon;
+--enable_warnings
+
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+--error ER_ILLEGAL_HA_CREATE_OPTION
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=MyISAM;
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+# No check applicable here.
+#SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+# No cleanup necessary in this case.
+#DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_31114.test
b/mysql-test/suite/falcon/t/falcon_bug_31114.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_31114.test	2008-04-14 23:30:14 +02:00
@@ -0,0 +1,37 @@
+--source include/have_falcon.inc
+#
+# Bug #31114: falcon : creating tablespace with same name twice returns
+#             Unknown error -103
+#
+--echo *** Bug #31114 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--error 0,ER_NO_SUCH_TABLESPACE
+DROP TABLESPACE ts1 ENGINE=falcon;
+--enable_warnings
+
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+--error ER_TABLESPACE_EXIST
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts2.fts' ENGINE=falcon;
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+# Check not applicable here.
+#SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+DROP TABLESPACE ts1 ENGINE=falcon;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_31296.test
b/mysql-test/suite/falcon/t/falcon_bug_31296.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_31296.test	2008-04-14 23:30:14 +02:00
@@ -0,0 +1,36 @@
+--source include/have_falcon.inc
+#
+# Bug #31296: falcon does not remove associated tablespace file.
+#
+--echo *** Bug #31296 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--error 0,ER_NO_SUCH_TABLESPACE
+DROP TABLESPACE ts1 ENGINE=falcon;
+--enable_warnings
+
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+DROP TABLESPACE ts1 ENGINE=falcon;
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+# Check is not suitable here.
+#SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+DROP TABLESPACE ts1 ENGINE=falcon;