List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:April 15 2008 5:29pm
Subject:bk commit into 6.0 tree (hakank:1.2642)
View as plain text  
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-15 19:29:36+02:00, hakank@lu0011.(none) +8 -0
  Splitted falcon_ts.test into several smaller tests.

  mysql-test/suite/falcon/r/falcon_bug_31295.result@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +22 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_31295.result''

  mysql-test/suite/falcon/r/falcon_bug_31295.result@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/r/falcon_bug_31296.result@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +5 -5
    Adjusted result file.

  mysql-test/suite/falcon/r/falcon_bug_31311.result@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +16 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_31311.result''

  mysql-test/suite/falcon/r/falcon_bug_31311.result@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/r/falcon_bug_33212.result@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +5 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_33212.result''

  mysql-test/suite/falcon/r/falcon_bug_33212.result@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/t/falcon_bug_31295.test@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +42 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_31295.test''

  mysql-test/suite/falcon/t/falcon_bug_31295.test@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/t/falcon_bug_31296.test@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +5 -5
    Replaced hard coded storage engine with $engine.

  mysql-test/suite/falcon/t/falcon_bug_31311.test@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +36 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_31311.test''

  mysql-test/suite/falcon/t/falcon_bug_31311.test@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/t/falcon_bug_33212.test@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +35 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_33212.test''

  mysql-test/suite/falcon/t/falcon_bug_33212.test@stripped, 2008-04-15 19:29:34+02:00, hakank@lu0011.(none) +0 -0

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_31295.result b/mysql-test/suite/falcon/r/falcon_bug_31295.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_31295.result	2008-04-15 19:29:34 +02:00
@@ -0,0 +1,22 @@
+*** Bug #31295 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+DROP TABLESPACE ts1 ENGINE 'Falcon';
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE 'Falcon';
+CREATE TABLE t1(a int);
+SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1';
+SCHEMA_NAME	TABLE_NAME	PARTITION	TABLESPACE	INTERNAL_NAME
+TEST	T1		FALCON_USER	T1
+ALTER TABLE t1 TABLESPACE ts1 ENGINE 'Falcon';
+SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1';
+SCHEMA_NAME	TABLE_NAME	PARTITION	TABLESPACE	INTERNAL_NAME
+TEST	T1		ts1	T1
+ALTER TABLE t1 ENGINE 'Falcon';
+SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1';
+SCHEMA_NAME	TABLE_NAME	PARTITION	TABLESPACE	INTERNAL_NAME
+TEST	T1		ts1	T1
+SELECT count(*) FROM t1;
+count(*)
+0
+DROP TABLE t1;
+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
--- a/mysql-test/suite/falcon/r/falcon_bug_31296.result	2008-04-14 23:30:14 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_31296.result	2008-04-15 19:29:34 +02:00
@@ -1,8 +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;
+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/r/falcon_bug_31311.result b/mysql-test/suite/falcon/r/falcon_bug_31311.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_31311.result	2008-04-15 19:29:34 +02:00
@@ -0,0 +1,16 @@
+*** Bug #31311 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+DROP TABLESPACE ts1 ENGINE 'Falcon';
+CREATE TABLESPACE `ts 1` ADD DATAFILE 'ts2.fts' ENGINE 'Falcon';
+CREATE TABLE t1(a int) TABLESPACE `ts 1`;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) /*!50100 TABLESPACE `ts 1` */ ENGINE=Falcon DEFAULT CHARSET=latin1
+SELECT count(*) FROM t1;
+count(*)
+0
+DROP TABLE t1;
+DROP TABLESPACE `ts 1` ENGINE 'Falcon';
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_33212.result b/mysql-test/suite/falcon/r/falcon_bug_33212.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_33212.result	2008-04-15 19:29:34 +02:00
@@ -0,0 +1,5 @@
+*** Bug #33212 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+DROP TABLESPACE ts1 ENGINE 'Falcon';
+ERROR HY000: Tablespace 'ts1' doesn't exist
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_31295.test b/mysql-test/suite/falcon/t/falcon_bug_31295.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_31295.test	2008-04-15 19:29:34 +02:00
@@ -0,0 +1,42 @@
+--source include/have_falcon.inc
+#
+# Bug #31295: NULL alter table operation causes falcon table to lose it's
+#             tablespace assoc 
+#
+--echo *** Bug #31295 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--error 0,ER_NO_SUCH_TABLESPACE
+eval DROP TABLESPACE ts1 ENGINE $engine;
+--enable_warnings
+
+eval CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE $engine;
+CREATE TABLE t1(a int);
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1';
+eval ALTER TABLE t1 TABLESPACE ts1 ENGINE $engine;
+SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1';
+eval ALTER TABLE t1 ENGINE $engine;
+SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1';
+
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+DROP TABLE t1;
+eval DROP TABLESPACE ts1 ENGINE $engine;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_31296.test b/mysql-test/suite/falcon/t/falcon_bug_31296.test
--- a/mysql-test/suite/falcon/t/falcon_bug_31296.test	2008-04-14 23:30:14 +02:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_31296.test	2008-04-15 19:29:34 +02:00
@@ -13,16 +13,16 @@ eval SET @@storage_engine = $engine;
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --error 0,ER_NO_SUCH_TABLESPACE
-DROP TABLESPACE ts1 ENGINE=falcon;
+eval DROP TABLESPACE ts1 ENGINE $engine;
 --enable_warnings
 
-CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+eval CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE $engine;
 
 # ----------------------------------------------------- #
 # --- Test                                          --- #
 # ----------------------------------------------------- #
-DROP TABLESPACE ts1 ENGINE=falcon;
-CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
+eval DROP TABLESPACE ts1 ENGINE $engine;
+eval CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE $engine;
 
 # ----------------------------------------------------- #
 # --- Check                                         --- #
@@ -33,4 +33,4 @@ CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.
 # ----------------------------------------------------- #
 # --- Final cleanup                                 --- #
 # ----------------------------------------------------- #
-DROP TABLESPACE ts1 ENGINE=falcon;
+eval DROP TABLESPACE ts1 ENGINE $engine;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_31311.test b/mysql-test/suite/falcon/t/falcon_bug_31311.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_31311.test	2008-04-15 19:29:34 +02:00
@@ -0,0 +1,36 @@
+--source include/have_falcon.inc
+#
+# Bug #31311: TABLESPACE identifiers do not support special characters
+#
+--echo *** Bug #31311 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--error 0,ER_NO_SUCH_TABLESPACE
+eval DROP TABLESPACE ts1 ENGINE $engine;
+--enable_warnings
+
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+eval CREATE TABLESPACE `ts 1` ADD DATAFILE 'ts2.fts' ENGINE $engine;
+CREATE TABLE t1(a int) TABLESPACE `ts 1`;
+SHOW CREATE TABLE t1;
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+DROP TABLE t1;
+eval DROP TABLESPACE `ts 1` ENGINE $engine;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_33212.test b/mysql-test/suite/falcon/t/falcon_bug_33212.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_33212.test	2008-04-15 19:29:34 +02:00
@@ -0,0 +1,35 @@
+--source include/have_falcon.inc
+#
+# Bug #33212:DROP TABLESPACE does not fail on non-existing Falcon
+#             tablespace.
+#
+--echo *** Bug #33212 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+--error ER_NO_SUCH_TABLESPACE
+eval DROP TABLESPACE ts1 ENGINE $engine;
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+# Check not applicable here.
+#SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+# Cleanup not applicable here.
+#DROP TABLE t1;
Thread
bk commit into 6.0 tree (hakank:1.2642)Hakan Kuecuekyilmaz15 Apr