Below is the list of changes that have just been committed into a local
6.0 repository of . When 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-01-30 01:58:02-06:00, klewis@klewis-mysql. +12 -0
Update Falcon test suite.
New error code added to handler.cc and sql_tablespace
used in current Falcon code.
include/my_base.h@stripped, 2008-01-30 01:57:24-06:00, klewis@klewis-mysql. +2 -1
New error code used in current Falcon code
mysql-test/suite/falcon/r/falcon_bug_29511.result@stripped, 2008-01-30 01:57:27-06:00, klewis@klewis-mysql. +1 -1
Update Falcon test suite
mysql-test/suite/falcon/r/falcon_bug_33662.result@stripped, 2008-01-30 01:57:51-06:00, klewis@klewis-mysql. +19 -0
Update Falcon test suite
mysql-test/suite/falcon/r/falcon_bug_33662.result@stripped, 2008-01-30 01:57:51-06:00, klewis@klewis-mysql. +0 -0
mysql-test/suite/falcon/r/falcon_deadlock_collection.result@stripped, 2008-01-30 01:57:52-06:00, klewis@klewis-mysql. +31 -0
Update Falcon test suite
mysql-test/suite/falcon/r/falcon_deadlock_collection.result@stripped, 2008-01-30 01:57:52-06:00, klewis@klewis-mysql. +0 -0
mysql-test/suite/falcon/r/falcon_ts.result@stripped, 2008-01-30 01:57:30-06:00, klewis@klewis-mysql. +3 -1
Update Falcon test suite
mysql-test/suite/falcon/t/disabled.def@stripped, 2008-01-30 01:57:33-06:00, klewis@klewis-mysql. +8 -8
Update Falcon test suite
mysql-test/suite/falcon/t/falcon_bug_29511.test@stripped, 2008-01-30 01:57:35-06:00, klewis@klewis-mysql. +1 -1
Update Falcon test suite
mysql-test/suite/falcon/t/falcon_bug_33662.test@stripped, 2008-01-30 01:57:46-06:00, klewis@klewis-mysql. +32 -0
Update Falcon test suite
mysql-test/suite/falcon/t/falcon_bug_33662.test@stripped, 2008-01-30 01:57:46-06:00, klewis@klewis-mysql. +0 -0
mysql-test/suite/falcon/t/falcon_deadlock_collection.test@stripped, 2008-01-30 01:57:49-06:00, klewis@klewis-mysql. +76 -0
Update Falcon test suite
mysql-test/suite/falcon/t/falcon_deadlock_collection.test@stripped, 2008-01-30 01:57:49-06:00, klewis@klewis-mysql. +0 -0
mysql-test/suite/falcon/t/falcon_options.test@stripped, 2008-01-30 01:57:38-06:00, klewis@klewis-mysql. +4 -0
Update Falcon test suite
mysql-test/suite/falcon/t/falcon_ts.test@stripped, 2008-01-30 01:57:40-06:00, klewis@klewis-mysql. +9 -4
Update Falcon test suite
sql/sql_tablespace.cc@stripped, 2008-01-30 01:57:43-06:00, klewis@klewis-mysql. +3 -0
New error code used in current Falcon code
diff -Nrup a/include/my_base.h b/include/my_base.h
--- a/include/my_base.h 2007-12-05 18:16:53 -06:00
+++ b/include/my_base.h 2008-01-30 01:57:24 -06:00
@@ -430,7 +430,8 @@ enum ha_base_keytype {
#define HA_ERR_CORRUPT_EVENT 172 /* The event was corrupt, leading to
illegal data being read */
#define HA_ERR_LOCK_OR_ACTIVE_TRANSACTION 173
-#define HA_ERR_LAST 173 /*Copy last error nr.*/
+#define HA_ERR_NO_SUCH_TABLESPACE 174
+#define HA_ERR_LAST 174 /*Copy last error nr.*/
/* Add error numbers before HA_ERR_LAST and change it accordingly. */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_29511.result b/mysql-test/suite/falcon/r/falcon_bug_29511.result
--- a/mysql-test/suite/falcon/r/falcon_bug_29511.result 2007-11-26 18:52:56 -06:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_29511.result 2008-01-30 01:57:27 -06:00
@@ -2,5 +2,5 @@
DROP TABLESPACE tablespace1 Engine Falcon;
CREATE TABLESPACE tablespace1 ADD DATAFILE 'falcon_tablespace.fts' Engine Falcon;
CREATE TABLESPACE tablespace2 ADD DATAFILE 'falcon_tablespace.fts' Engine Falcon;
-ERROR HY000: Tablespace 'tablespace2' already exists
+ERROR HY000: Tablespace 'tablespace2' already exist
DROP TABLESPACE tablespace1 Engine Falcon;
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_33662.result b/mysql-test/suite/falcon/r/falcon_bug_33662.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_33662.result 2008-01-30 01:57:51 -06:00
@@ -0,0 +1,19 @@
+*** Bug #33662 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (i int NOT NULL AUTO_INCREMENT, PRIMARY KEY (i)) AUTO_INCREMENT=2
+DEFAULT CHARSET=latin1;
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `i` int(11) NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`i`)
+) ENGINE=Falcon AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
+INSERT INTO t1 VALUES();
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `i` int(11) NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`i`)
+) ENGINE=Falcon AUTO_INCREMENT=3 DEFAULT CHARSET=latin1
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/r/falcon_deadlock_collection.result b/mysql-test/suite/falcon/r/falcon_deadlock_collection.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_deadlock_collection.result 2008-01-30 01:57:52 -06:00
@@ -0,0 +1,31 @@
+*** Deadlock related tests for Falcon ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+SET @@autocommit = 0;
+CREATE TABLE t1 (a int, PRIMARY KEY (a));
+INSERT INTO t1 (a) VALUES (1), (2);
+COMMIT;
+# Establish connection conn1
+SET storage_engine = 'Falcon';
+SET @@autocommit = 0;
+# Switch to connection default
+UPDATE t1 SET a = 3 WHERE a = 2;
+# Switch to connection conn1
+UPDATE t1 SET a = 4 WHERE a = 1;
+# Switch to connection default
+UPDATE t1 SET a = 5 WHERE a = 1;
+# Switch to connection conn1
+UPDATE t1 SET a = 6 WHERE a = 2;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+ROLLBACK;
+# Switch to connection default
+SELECT a FROM t1 ORDER BY a;
+a
+3
+5
+COMMIT;
+SELECT count(*) FROM t1;
+count(*)
+2
+COMMIT;
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/r/falcon_ts.result b/mysql-test/suite/falcon/r/falcon_ts.result
--- a/mysql-test/suite/falcon/r/falcon_ts.result 2007-12-14 09:57:58 -06:00
+++ b/mysql-test/suite/falcon/r/falcon_ts.result 2008-01-30 01:57:30 -06:00
@@ -4,7 +4,7 @@ CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.
ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
CREATE TABLESPACE ts1 ADD DATAFILE 'ts2.fts' ENGINE=falcon;
-ERROR HY000: Tablespace 'ts1' already exists
+ERROR HY000: Tablespace 'ts1' already exist
DROP TABLESPACE ts1 ENGINE=falcon;
CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
DROP TABLESPACE ts1 ENGINE=falcon;
@@ -34,3 +34,5 @@ t1 CREATE TABLE `t1` (
) /*!50100 TABLESPACE `ts 1` */ ENGINE=Falcon DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP TABLESPACE `ts 1` ENGINE=falcon;
+DROP TABLESPACE ts1 ENGINE=falcon;
+ERROR HY000: Tablespace 'ts1' doesn't exist
diff -Nrup a/mysql-test/suite/falcon/t/disabled.def b/mysql-test/suite/falcon/t/disabled.def
--- a/mysql-test/suite/falcon/t/disabled.def 2007-12-19 03:20:50 -06:00
+++ b/mysql-test/suite/falcon/t/disabled.def 2008-01-30 01:57:33 -06:00
@@ -29,8 +29,8 @@ falcon_bug_26058 : Bug#26058 2007-05-
falcon_bug_27997 : Bug#27997 2007-04-21 hakank Currently failing
falcon_bug_28006 : Bug#28006 2007-08-22 hakank Won't fix, see also Bug#15491
falcon_bug_28076 : Bug#28076 2007-04-25 klewis Currently failing
-falcon_bug_28095_I : Bug#32992 2007-12-19 hakank Currently failing
-falcon_bug_28095_II : Bug#32992 2007-12-19 hakank Currently failing
+#falcon_bug_28095_I : Bug#32992 2007-12-19 hakank Currently failing
+#falcon_bug_28095_II : Bug#32992 2007-12-19 hakank Currently failing
falcon_bug_29246 : Bug#29246 2007-06-21 hakank Currently failing
falcon_bug_30282 : Bug#30282 2007-08-21 hakank Currently failing
falcon_bug_30878 : Bug#30878 2007-09-06 cpowers Currently failing (server bug)
@@ -38,15 +38,15 @@ falcon_bug_30480_A : Bug#30282 2007-09-
falcon_bug_30480_B : Bug#30282 2007-09-07 klewis Currently failing
falcon_bug_32413 : Bug#32413 2007-11-15 cpowers Does not play nicely with other tests
falcon_page_size_1 : Bug#32992 2007-12-03 hakank Currently failing
-falcon_page_size_2 : Bug#32992 2007-12-03 hakank Currently failing
-falcon_page_size_4 : Bug#32992 2007-12-03 hakank Currently failing
-falcon_page_size_8 : Bug#32992 2007-12-03 hakank Currently failing
-falcon_page_size_16 : Bug#32992 2007-12-03 hakank Currently failing
-falcon_page_size_32 : Bug#32992 2007-12-03 hakank Currently failing
+#falcon_page_size_2 : Bug#32992 2007-12-03 hakank Currently failing
+#falcon_page_size_4 : Bug#32992 2007-12-03 hakank Currently failing
+#falcon_page_size_8 : Bug#32992 2007-12-03 hakank Currently failing
+#falcon_page_size_16 : Bug#32992 2007-12-03 hakank Currently failing
+#falcon_page_size_32 : Bug#32992 2007-12-03 hakank Currently failing
read_many_rows_falcon : Bug#23783 2006-10-30 ML Get pushbuild green
index_merge_falcon : Bug#32696 index_merge_falcon.test fails
falcon_bug_26433 : Bug#32697 falcon_bug_26433.test fails randomly
falcon_bug_27951 : Bug#32731 falcon_bug_27951 fails randomly
ps_8falcon : Bug #32683 Test ps_8falcon fails in 6.0
-falcon_read-committed: Bug#32992: falcon_read-committed.test causes a server crash occasionally
+#falcon_read-committed: Bug#32992: falcon_read-committed.test causes a server crash occasionally
falcon_ts : Bug#32993: falcon_ts.test fails sporadically
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_29511.test b/mysql-test/suite/falcon/t/falcon_bug_29511.test
--- a/mysql-test/suite/falcon/t/falcon_bug_29511.test 2007-11-26 19:42:36 -06:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_29511.test 2008-01-30 01:57:35 -06:00
@@ -9,7 +9,7 @@
# ----------------------------------------------------- #
--disable_warnings
---error 0,65433
+--error 0,ER_NO_SUCH_TABLESPACE
DROP TABLESPACE tablespace1 Engine Falcon;
--enable_warnings
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_33662.test b/mysql-test/suite/falcon/t/falcon_bug_33662.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_33662.test 2008-01-30 01:57:46 -06:00
@@ -0,0 +1,32 @@
+#
+# Bug #33662: autoincrement value not show in "show create table"
+#
+--echo *** Bug #33662 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
+CREATE TABLE t1 (i int NOT NULL AUTO_INCREMENT, PRIMARY KEY (i)) AUTO_INCREMENT=2
+DEFAULT CHARSET=latin1;
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SHOW CREATE TABLE t1;
+
+INSERT INTO t1 VALUES();
+#--check auto_increment is 3 after insert
+SHOW CREATE TABLE t1;
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_deadlock_collection.test b/mysql-test/suite/falcon/t/falcon_deadlock_collection.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_deadlock_collection.test 2008-01-30 01:57:49 -06:00
@@ -0,0 +1,76 @@
+--source include/have_falcon.inc
+#
+# Collection of deadlock related tests for Falcon.
+#
+# Currently Falcon detects deadlocks instantly and
+# issues an error message, but does not roll back
+# any transaction involved in the deadlock.
+# Please note that cross engine deadlocks are not
+# detectable yet. For cross engine deadlock Falcon has
+# a parameter called falcon_lock_wait_timeout. If Falcon
+# waits longer than falcon_lock_wait_timeout on a given
+# transaction, it bails out with a wait timeout error.
+#
+--echo *** Deadlock related tests for Falcon ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+SET @@autocommit = 0;
+CREATE TABLE t1 (a int, PRIMARY KEY (a));
+INSERT INTO t1 (a) VALUES (1), (2);
+COMMIT;
+
+--echo # Establish connection conn1
+connect (conn1,localhost,root,,);
+eval SET storage_engine = $engine;
+SET @@autocommit = 0;
+
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
+--echo # Switch to connection default
+connection default;
+UPDATE t1 SET a = 3 WHERE a = 2;
+
+--echo # Switch to connection conn1
+connection conn1;
+UPDATE t1 SET a = 4 WHERE a = 1;
+
+--echo # Switch to connection default
+connection default;
+--real_sleep 1
+--send UPDATE t1 SET a = 5 WHERE a = 1
+
+--echo # Switch to connection conn1
+connection conn1;
+--real_sleep 1
+# Now we should get a deadlock error message.
+--error ER_LOCK_DEADLOCK
+UPDATE t1 SET a = 6 WHERE a = 2;
+ROLLBACK;
+
+--echo # Switch to connection default
+connection default;
+--reap
+SELECT a FROM t1 ORDER BY a;
+COMMIT;
+
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+COMMIT;
+
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
+disconnect conn1;
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_options.test b/mysql-test/suite/falcon/t/falcon_options.test
--- a/mysql-test/suite/falcon/t/falcon_options.test 2007-09-20 10:43:43 -05:00
+++ b/mysql-test/suite/falcon/t/falcon_options.test 2008-01-30 01:57:38 -06:00
@@ -2,6 +2,8 @@
SHOW VARIABLES LIKE 'falcon_%';
+--real_sleep=10
+
# Test that these server variables are READ ONLY.
SELECT @@GLOBAL.falcon_debug_server;
@@ -42,3 +44,5 @@ SELECT @@GLOBAL.falcon_record_memory_max
--sorted_result
SELECT * FROM INFORMATION_SCHEMA.global_variables
WHERE variable_name LIKE 'falcon%';
+
+--real_sleep=10
diff -Nrup a/mysql-test/suite/falcon/t/falcon_ts.test b/mysql-test/suite/falcon/t/falcon_ts.test
--- a/mysql-test/suite/falcon/t/falcon_ts.test 2007-12-13 11:07:57 -06:00
+++ b/mysql-test/suite/falcon/t/falcon_ts.test 2008-01-30 01:57:40 -06:00
@@ -2,11 +2,9 @@
--disable_warnings
DROP TABLE IF EXISTS t1;
---enable_warnings
-
---disable_errors
+--error 0,ER_NO_SUCH_TABLESPACE
DROP TABLESPACE ts1 ENGINE=falcon;
---enable_errors
+--enable_warnings
#
# BUG#31110 - falcon: missing engine check while dropping tablespace
@@ -53,3 +51,10 @@ CREATE TABLE t1(a INT) ENGINE=falcon TAB
SHOW CREATE TABLE t1;
DROP TABLE t1;
DROP TABLESPACE `ts 1` ENGINE=falcon;
+
+#
+# BUG#33212 - DROP TABLESPACE does not fail on non-existing Falcon
+# tablespace
+#
+--error ER_NO_SUCH_TABLESPACE
+DROP TABLESPACE ts1 ENGINE=falcon;
diff -Nrup a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc
--- a/sql/sql_tablespace.cc 2007-11-14 17:00:50 -06:00
+++ b/sql/sql_tablespace.cc 2008-01-30 01:57:43 -06:00
@@ -52,6 +52,9 @@ int mysql_alter_tablespace(THD *thd, st_
case HA_ERR_TABLESPACE_EXIST:
my_error(ER_TABLESPACE_EXIST, MYF(0), ts_info->tablespace_name);
break;
+ case HA_ERR_NO_SUCH_TABLESPACE:
+ my_error(ER_NO_SUCH_TABLESPACE, MYF(0), ts_info->tablespace_name);
+ break;
default:
my_error(error, MYF(0));
}
| Thread |
|---|
| • bk commit into 6.0 tree (klewis:1.2783) | klewis | 30 Jan |
