MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:April 3 2009 9:36pm
Subject:bzr push into mysql-6.0-falcon-team branch (hky:3100)
View as plain text  
 3100 Hakan Kuecuekyilmaz	2009-04-03 [merge]
      Automerge.

    modified:
      storage/falcon/DeferredIndex.cpp
=== modified file 'mysql-test/suite/falcon/r/falcon_bug_22972.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_22972.result	2008-10-07 10:26:19 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_22972.result	2009-04-03 14:39:43 +0000
@@ -1,21 +1,13 @@
 *** Bug #22972 ***
 SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
-CREATE TABLE t1(a int);
+CREATE TABLE t1(a int) PARTITION BY LIST (a) (PARTITION p1 VALUES in (1));
 # Establish connection conn1 (root)
 # Switch to connection conn1
 START TRANSACTION;
 INSERT INTO t1 VALUES(1);
 # Switch to connection default
 DROP TABLE t1;
-ERROR 42S02: Unknown table 't1'
-SHOW WARNINGS;
-Level	Code	Message
-Warning	178	Can't execute the given command because you have active locked tables or an active transaction
 # Switch to connection conn1
 COMMIT;
-SELECT count(*) FROM t1;
-count(*)
-1
 # Switch to connection default
-DROP TABLE t1;

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_24024.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_24024.result	2008-09-09 14:59:40 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_24024.result	2009-04-03 15:29:58 +0000
@@ -1,12 +1,13 @@
 *** Bug #24024 ***
 SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
+SET @@autocommit = 0;
 CREATE TABLE t1(a int, b int, primary key(a));
 INSERT INTO t1(a) VALUES (1);
 COMMIT;
 # Establish connection conn1 (user=root)
-# Switch to connection default
 SET @@autocommit = 0;
+# Switch to connection default
 UPDATE t1 SET b = 5 WHERE a = 1;
 # Switch to connection conn1
 INSERT INTO t1(a) VALUES(7);
@@ -15,17 +16,9 @@ SELECT * FROM t1;
 a	b
 1	NULL
 7	NULL
-!!! Error message is total crap!
-!!! Something like "Cannot drop locked table" or similar would be fine,
-!!! But never the misleading    ERROR 42S02: Unknown table 't1'.
 DROP TABLE t1;
-ERROR 42S02: Unknown table 't1'
-SHOW WARNINGS;
-Level	Code	Message
-Warning	178	Can't execute the given command because you have active locked tables or an active transaction
-SELECT count(*) FROM t1;
-count(*)
-2
 # Switch to connection default
 COMMIT;
-DROP TABLE t1;
+# Switch to connection conn1
+COMMIT;
+# Switch to connection default

=== modified file 'mysql-test/suite/falcon/t/disabled.def'
--- a/mysql-test/suite/falcon/t/disabled.def	2009-03-31 15:23:42 +0000
+++ b/mysql-test/suite/falcon/t/disabled.def	2009-04-03 15:29:58 +0000
@@ -10,5 +10,3 @@
 #
 ##############################################################################
 
-falcon_bug_22972      : WL#4284: Can't drop table used by a pending transaction (there is metadata lock on the table).
-falcon_bug_24024      : WL#4284: Can't drop table used by a pending transaction (there is metadata lock on the table).

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_22972.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_22972.test	2008-09-09 08:30:18 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22972.test	2009-04-03 14:39:43 +0000
@@ -1,7 +1,8 @@
 --source include/have_falcon.inc
 
 #
-# Bug #22972: Falcon: Partitioned table with pending transaction leads to strange error
+# Bug #22972: Falcon: Partitioned table with pending transaction
+#             leads to strange error
 #
 --echo *** Bug #22972 ***
 
@@ -15,7 +16,7 @@ eval SET @@storage_engine = $engine;
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
-CREATE TABLE t1(a int);
+CREATE TABLE t1(a int) PARTITION BY LIST (a) (PARTITION p1 VALUES in (1));
 
 --echo # Establish connection conn1 (root)
 connect (conn1,localhost,root,,);
@@ -29,23 +30,24 @@ INSERT INTO t1 VALUES(1);
 
 --echo # Switch to connection default
 connection default;
---error ER_BAD_TABLE_ERROR
-DROP TABLE t1;
-SHOW WARNINGS;
+--send DROP TABLE t1
+--real_sleep 1
 
 --echo # Switch to connection conn1
 connection conn1;
 COMMIT;
 
+--echo # Switch to connection default
+connection default;
+--reap
+
 # ----------------------------------------------------- #
 # --- Check                                         --- #
 # ----------------------------------------------------- #
-SELECT count(*) FROM t1;
+# Final check not applicable here.
+#SELECT count(*) FROM t1;
 
 # ----------------------------------------------------- #
 # --- Final cleanup                                 --- #
 # ----------------------------------------------------- #
---echo # Switch to connection default
-connection default;
 disconnect conn1;
-DROP TABLE t1;

=== modified file 'mysql-test/suite/falcon/t/falcon_bug_24024.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_24024.test	2008-09-09 14:59:40 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_24024.test	2009-04-03 15:29:58 +0000
@@ -1,7 +1,8 @@
 --source include/have_falcon.inc
 
 #
-# Bug #24024: wrong error message when drop table (used by pending transaction) fails
+# Bug #24024: wrong error message when drop table
+#             (used by pending transaction) fails
 #
 # This test is a derivate of a subtestcase in mix2.inc.
 # Therefore please delete this test when mix2_falcon is pushed.
@@ -18,19 +19,20 @@ eval SET @@storage_engine = $engine;
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
+SET @@autocommit = 0;
 CREATE TABLE t1(a int, b int, primary key(a));
 INSERT INTO t1(a) VALUES (1);
 COMMIT;
 
 --echo # Establish connection conn1 (user=root)
 connect (conn1,localhost,root,,);
+SET @@autocommit = 0;
 
 # ----------------------------------------------------- #
 # --- Test                                          --- #
 # ----------------------------------------------------- #
 --echo # Switch to connection default
 connection default;
-SET @@autocommit = 0;
 UPDATE t1 SET b = 5 WHERE a = 1;
 
 --echo # Switch to connection conn1
@@ -38,18 +40,24 @@ connection conn1;
 INSERT INTO t1(a) VALUES(7);
 COMMIT;
 SELECT * FROM t1;
+--send DROP TABLE t1
+--real_sleep 1
+
+--echo # Switch to connection default
+connection default;
+COMMIT;
+
+--echo # Switch to connection conn1
+connection conn1;
+--reap
+COMMIT;
 
---echo !!! Error message is total crap!
---echo !!! Something like "Cannot drop locked table" or similar would be fine,
---echo !!! But never the misleading    ERROR 42S02: Unknown table 't1'.
---error ER_BAD_TABLE_ERROR
-DROP TABLE t1;
-SHOW WARNINGS;
 
 # ----------------------------------------------------- #
 # --- Check                                         --- #
 # ----------------------------------------------------- #
-SELECT count(*) FROM t1;
+# Final check not applicable here.
+#SELECT count(*) FROM t1;
 
 # ----------------------------------------------------- #
 # --- Final cleanup                                 --- #
@@ -57,5 +65,3 @@ SELECT count(*) FROM t1;
 --echo # Switch to connection default
 connection default;
 disconnect conn1;
-COMMIT;
-DROP TABLE t1;


Attachment: [text/bzr-bundle] bzr/hky@sun.com-20090403213551-v3vqmwia89wlmgc6.bundle
Thread
bzr push into mysql-6.0-falcon-team branch (hky:3100)Hakan Kuecuekyilmaz3 Apr