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-12-07 21:28:49+01:00, hakank@lu0011.(none) +8 -0
Adjusted test cases to reflect falcon_consisten_read
flag, which is a global setting.
mysql-test/suite/falcon/r/falcon_bug_29151.result@stripped, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +11 -7
Adjusted test case to reflect falcon_consisten_read
flag, which is a global setting.
mysql-test/suite/falcon/r/falcon_bug_29151_A.result@stripped, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +13 -12
Adjusted test case to reflect falcon_consisten_read
flag, which is a global setting.
mysql-test/suite/falcon/r/falcon_bug_29151_B.result@stripped, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +13 -12
Adjusted test case to reflect falcon_consisten_read
flag, which is a global setting.
mysql-test/suite/falcon/r/falcon_bug_29151_C.result@stripped, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +14 -13
Adjusted test case to reflect falcon_consisten_read
flag, which is a global setting.
mysql-test/suite/falcon/t/falcon_bug_29151.test@stripped, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +21 -12
Adjusted test case to reflect falcon_consisten_read
flag, which is a global setting.
mysql-test/suite/falcon/t/falcon_bug_29151_A.test@stripped, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +29 -23
Adjusted test case to reflect falcon_consisten_read
flag, which is a global setting.
mysql-test/suite/falcon/t/falcon_bug_29151_B.test@stripped, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +29 -23
Adjusted test case to reflect falcon_consisten_read
flag, which is a global setting.
mysql-test/suite/falcon/t/falcon_bug_29151_C.test@stripped, 2007-12-07 21:28:44+01:00, hakank@lu0011.(none) +31 -25
Adjusted test case to reflect falcon_consisten_read
flag, which is a global setting.
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_29151.result b/mysql-test/suite/falcon/r/falcon_bug_29151.result
--- a/mysql-test/suite/falcon/r/falcon_bug_29151.result 2007-11-03 06:33:20 +01:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_29151.result 2007-12-07 21:28:44 +01:00
@@ -1,6 +1,6 @@
*** Bug #29151 ***
SET @@storage_engine = 'Falcon';
-SET GLOBAL FALCON_CONSISTENT_READ=OFF;
+SET GLOBAL falcon_consistent_read = off;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
a int,
@@ -8,26 +8,30 @@ b int,
c char(50),
PRIMARY KEY (a)
);
-SET @@autocommit = 0;
# Establish connection conn1
SET storage_engine = 'Falcon';
+SET @@tx_isolation = 'REPEATABLE-READ';
+SET @@autocommit = 0;
+# Establish connection conn2
+SET storage_engine = 'Falcon';
+SET @@tx_isolation = 'REPEATABLE-READ';
SET @@autocommit = 0;
INSERT INTO t1 VALUES(49990, 0, 'c1');
COMMIT;
-# Switch to connection default
+# Switch to connection conn1
BEGIN;
UPDATE t1 SET b=b+1 WHERE a = 49990;
DELETE FROM t1 WHERE a = 49990;
INSERT INTO t1 VALUES(49990, 0, 'c1');
-# Switch to connection conn1
+# Switch to connection conn2
BEGIN;
SELECT * FROM t1;
a b c
49990 0 c1
UPDATE t1 SET b=b+1 WHERE a = 49990;
-# Switch to connection default
-COMMIT;
# Switch to connection conn1
+COMMIT;
+# Switch to connection conn2
DELETE FROM t1 WHERE a = 49990;
INSERT INTO t1 VALUES(49990, 0, 'c2');
COMMIT;
@@ -37,4 +41,4 @@ a b c
COMMIT;
# Switch to connection default
DROP TABLE t1;
-SET GLOBAL FALCON_CONSISTENT_READ=ON;
+SET GLOBAL falcon_consistent_read = on;
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_29151_A.result b/mysql-test/suite/falcon/r/falcon_bug_29151_A.result
--- a/mysql-test/suite/falcon/r/falcon_bug_29151_A.result 2007-11-03 06:33:22 +01:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_29151_A.result 2007-12-07 21:28:44 +01:00
@@ -1,11 +1,12 @@
*** Bug #29151 ***
SET @@storage_engine = Falcon;
-SET GLOBAL FALCON_CONSISTENT_READ=ON;
+SET GLOBAL falcon_consistent_read = on;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c char(10), PRIMARY KEY (a));
# Establish connection conn1
+# Establish connection conn2
INSERT INTO t1 VALUES(490, 0, 'inserted');
-# Switch to connection default
+# Switch to connection conn1
BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
@@ -13,18 +14,18 @@ INSERT INTO t1 VALUES(490, 1, 'inserted'
SELECT * FROM t1;
a b c
490 1 inserted
-# Switch to connection conn1
+# Switch to connection conn2
BEGIN;
SELECT * FROM t1;
a b c
490 0 inserted
UPDATE t1 SET c = 'updated' WHERE a = 490;
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
490 1 inserted
COMMIT;
-# Switch to connection conn1
+# Switch to connection conn2
ERROR HY000: Record has changed since last read in table 't1'
SELECT * FROM t1;
a b c
@@ -38,18 +39,18 @@ BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 3, 'inserted');
-# Switch to connection default
+# Switch to connection conn1
BEGIN;
SELECT * FROM t1;
a b c
490 1 inserted
DELETE FROM t1 WHERE a = 490;
-# Switch to connection conn1
+# Switch to connection conn2
SELECT * FROM t1;
a b c
490 3 inserted
COMMIT;
-# Switch to connection default
+# Switch to connection conn1
ERROR HY000: Record has changed since last read in table 't1'
SELECT * FROM t1;
a b c
@@ -61,23 +62,23 @@ a b c
490 3 inserted
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
-# Switch to connection conn1
+# Switch to connection conn2
BEGIN;
SELECT * FROM t1;
a b c
490 3 inserted
INSERT INTO t1 VALUES(490, 5, 'inserted');
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
COMMIT;
-# Switch to connection conn1
+# Switch to connection conn2
ERROR 23000: Duplicate entry '490' for key 'PRIMARY'
SELECT * FROM t1;
a b c
490 3 inserted
COMMIT;
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
# Switch to connection default
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_29151_B.result b/mysql-test/suite/falcon/r/falcon_bug_29151_B.result
--- a/mysql-test/suite/falcon/r/falcon_bug_29151_B.result 2007-11-03 06:33:24 +01:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_29151_B.result 2007-12-07 21:28:44 +01:00
@@ -1,11 +1,12 @@
*** Bug #29151 ***
SET @@storage_engine = Falcon;
-SET GLOBAL FALCON_CONSISTENT_READ=ON;
+SET GLOBAL falcon_consistent_read = on;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c char(10), PRIMARY KEY (a));
# Establish connection conn1
+# Establish connection conn2
INSERT INTO t1 VALUES(490, 0, 'inserted');
-# Switch to connection default
+# Switch to connection conn1
BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
@@ -13,18 +14,18 @@ INSERT INTO t1 VALUES(490, 1, 'inserted'
SELECT * FROM t1;
a b c
490 1 inserted
-# Switch to connection conn1
+# Switch to connection conn2
BEGIN;
SELECT * FROM t1;
a b c
490 0 inserted
UPDATE t1 SET c = 'updated' WHERE a = 490;
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
490 1 inserted
ROLLBACK;
-# Switch to connection conn1
+# Switch to connection conn2
SELECT * FROM t1;
a b c
490 0 updated
@@ -38,13 +39,13 @@ BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 3, 'inserted');
-# Switch to connection default
+# Switch to connection conn1
BEGIN;
SELECT * FROM t1;
a b c
490 2 inserted
DELETE FROM t1 WHERE a = 490;
-# Switch to connection conn1
+# Switch to connection conn2
SELECT * FROM t1;
a b c
490 3 inserted
@@ -52,30 +53,30 @@ ROLLBACK;
SELECT * FROM t1;
a b c
490 2 inserted
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
COMMIT;
BEGIN;
INSERT INTO t1 VALUES(490, 4, 'inserted');
-# Switch to connection conn1
+# Switch to connection conn2
BEGIN;
SELECT * FROM t1;
a b c
INSERT INTO t1 VALUES(490, 5, 'inserted');
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
490 4 inserted
ROLLBACK;
SELECT * FROM t1;
a b c
-# Switch to connection conn1
+# Switch to connection conn2
SELECT * FROM t1;
a b c
490 5 inserted
COMMIT;
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
490 5 inserted
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_29151_C.result b/mysql-test/suite/falcon/r/falcon_bug_29151_C.result
--- a/mysql-test/suite/falcon/r/falcon_bug_29151_C.result 2007-11-04 18:35:55 +01:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_29151_C.result 2007-12-07 21:28:44 +01:00
@@ -1,13 +1,14 @@
*** Bug #29151 ***
*** Initialization for 'InnoDB Compatibility Mode'
SET @@storage_engine = Falcon;
-SET GLOBAL FALCON_CONSISTENT_READ=OFF;
+SET GLOBAL falcon_consistent_read = off;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c char(10), PRIMARY KEY (a));
# Establish connection conn1
+# Establish connection conn2
INSERT INTO t1 VALUES(490, 0, 'inserted');
*** Test if an UPDATE will get the new record after waiting
-# Switch to connection default
+# Switch to connection conn1
BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
@@ -15,18 +16,18 @@ INSERT INTO t1 VALUES(490, 1, 'inserted'
SELECT * FROM t1;
a b c
490 1 inserted
-# Switch to connection conn1
+# Switch to connection conn2
BEGIN;
SELECT * FROM t1;
a b c
490 0 inserted
UPDATE t1 SET c = 'updated' WHERE a = 490;
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
490 1 inserted
COMMIT;
-# Switch to connection conn1
+# Switch to connection conn2
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 2, 'inserted');
COMMIT;
@@ -38,18 +39,18 @@ BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 3, 'inserted');
-# Switch to connection default
+# Switch to connection conn1
BEGIN;
SELECT * FROM t1;
a b c
490 2 inserted
DELETE FROM t1 WHERE a = 490;
-# Switch to connection conn1
+# Switch to connection conn2
SELECT * FROM t1;
a b c
490 3 inserted
COMMIT;
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
490 2 inserted
@@ -67,26 +68,26 @@ UPDATE t1 SET c = 'updated' WHERE a = 49
DELETE FROM t1 WHERE a = 490;
SELECT * FROM t1;
a b c
-# Switch to connection conn1
+# Switch to connection conn2
BEGIN;
SELECT * FROM t1;
a b c
490 4 inserted
INSERT INTO t1 VALUES(490, 5, 'inserted');
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
COMMIT;
-# Switch to connection conn1
+# Switch to connection conn2
SELECT * FROM t1;
a b c
490 4 inserted
490 5 inserted
COMMIT;
-# Switch to connection default
+# Switch to connection conn1
SELECT * FROM t1;
a b c
490 5 inserted
# Switch to connection default
DROP TABLE t1;
-SET GLOBAL FALCON_CONSISTENT_READ=ON;
+SET GLOBAL falcon_consistent_read = on;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_29151.test b/mysql-test/suite/falcon/t/falcon_bug_29151.test
--- a/mysql-test/suite/falcon/t/falcon_bug_29151.test 2007-12-05 23:52:31 +01:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_29151.test 2007-12-07 21:28:44 +01:00
@@ -9,7 +9,7 @@
# ----------------------------------------------------- #
let $engine = 'Falcon';
eval SET @@storage_engine = $engine;
-SET GLOBAL FALCON_CONSISTENT_READ=OFF;
+SET GLOBAL falcon_consistent_read = off;
--disable_warnings
DROP TABLE IF EXISTS t1;
@@ -22,39 +22,47 @@ CREATE TABLE t1 (
PRIMARY KEY (a)
);
-SET @@autocommit = 0;
-
+# We need to set up an exlipicit connection here,
+# as SET GLOBAL does not set the current connection's setting.
--echo # Establish connection conn1
connect (conn1,localhost,root,,);
eval SET storage_engine = $engine;
+SET @@tx_isolation = 'REPEATABLE-READ';
+SET @@autocommit = 0;
+
+--echo # Establish connection conn2
+connect (conn2,localhost,root,,);
+eval SET storage_engine = $engine;
+SET @@tx_isolation = 'REPEATABLE-READ';
SET @@autocommit = 0;
+
INSERT INTO t1 VALUES(49990, 0, 'c1');
COMMIT;
# ----------------------------------------------------- #
# --- Test --- #
# ----------------------------------------------------- #
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
BEGIN;
UPDATE t1 SET b=b+1 WHERE a = 49990;
DELETE FROM t1 WHERE a = 49990;
INSERT INTO t1 VALUES(49990, 0, 'c1');
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
BEGIN;
SELECT * FROM t1;
# This one blocks until other transaction COMMITs.
--send UPDATE t1 SET b=b+1 WHERE a = 49990
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
--real_sleep 1
COMMIT;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
--reap
DELETE FROM t1 WHERE a = 49990;
# This gives an error with Falcon, but it should not.
@@ -73,5 +81,6 @@ COMMIT;
--echo # Switch to connection default
connection default;
disconnect conn1;
+disconnect conn2;
DROP TABLE t1;
-SET GLOBAL FALCON_CONSISTENT_READ=ON;
+SET GLOBAL falcon_consistent_read = on;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_29151_A.test b/mysql-test/suite/falcon/t/falcon_bug_29151_A.test
--- a/mysql-test/suite/falcon/t/falcon_bug_29151_A.test 2007-11-03 06:33:33 +01:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_29151_A.test 2007-12-07 21:28:44 +01:00
@@ -11,7 +11,7 @@
# --- Initialization for Falcon's Consistent Read
# -----------------------------------------------------
SET @@storage_engine = Falcon;
-SET GLOBAL FALCON_CONSISTENT_READ=ON;
+SET GLOBAL falcon_consistent_read = on;
--disable_warnings
DROP TABLE IF EXISTS t1;
@@ -19,36 +19,41 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c char(10), PRIMARY KEY (a));
+# We need to set up an exlipicit connection here,
+# as SET GLOBAL does not set the current connection's setting.
--echo # Establish connection conn1
connect (conn1,localhost,root,,);
+
+--echo # Establish connection conn2
+connect (conn2,localhost,root,,);
INSERT INTO t1 VALUES(490, 0, 'inserted');
# -------------------------------------------------------
# Test if an UPDATE will fail after waiting
# -------------------------------------------------------
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 1, 'inserted');
SELECT * FROM t1;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
BEGIN;
SELECT * FROM t1;
# This one blocks in case the other transaction aborts.
--send UPDATE t1 SET c = 'updated' WHERE a = 490
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
--real_sleep 1
COMMIT;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
--error 1020
--reap
SELECT * FROM t1;
@@ -68,20 +73,20 @@ UPDATE t1 SET c = 'updated' WHERE a = 49
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 3, 'inserted');
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
BEGIN;
SELECT * FROM t1;
--send DELETE FROM t1 WHERE a = 490
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
SELECT * FROM t1;
--real_sleep 1
COMMIT;
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
--error 1020
--reap
SELECT * FROM t1;
@@ -96,27 +101,27 @@ SELECT * FROM t1;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
BEGIN;
SELECT * FROM t1;
--send INSERT INTO t1 VALUES(490, 5, 'inserted')
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
--real_sleep 1
COMMIT;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
--error ER_DUP_ENTRY
--reap
SELECT * FROM t1;
COMMIT;
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
# ----------------------------------------------------- #
@@ -125,4 +130,5 @@ SELECT * FROM t1;
--echo # Switch to connection default
connection default;
disconnect conn1;
+disconnect conn2;
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_29151_B.test b/mysql-test/suite/falcon/t/falcon_bug_29151_B.test
--- a/mysql-test/suite/falcon/t/falcon_bug_29151_B.test 2007-11-03 06:33:35 +01:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_29151_B.test 2007-12-07 21:28:44 +01:00
@@ -11,7 +11,7 @@
# --- Initialization for Falcon's Consistent Read
# -----------------------------------------------------
eval SET @@storage_engine = Falcon;
-SET GLOBAL FALCON_CONSISTENT_READ=ON;
+SET GLOBAL falcon_consistent_read = on;
--disable_warnings
DROP TABLE IF EXISTS t1;
@@ -19,36 +19,41 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c char(10), PRIMARY KEY (a));
+# We need to set up an exlipicit connection here,
+# as SET GLOBAL does not set the current connection's setting.
--echo # Establish connection conn1
connect (conn1,localhost,root,,);
+
+--echo # Establish connection conn2
+connect (conn2,localhost,root,,);
INSERT INTO t1 VALUES(490, 0, 'inserted');
# -------------------------------------------------------------------
# Test if an UPDATE will succeed after waiting on a trans that aborts
# -------------------------------------------------------------------
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 1, 'inserted');
SELECT * FROM t1;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
BEGIN;
SELECT * FROM t1;
# This one blocks in case the other transaction aborts.
--send UPDATE t1 SET c = 'updated' WHERE a = 490
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
--real_sleep 1
ROLLBACK;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
--reap
SELECT * FROM t1;
DELETE FROM t1 WHERE a = 490;
@@ -66,21 +71,21 @@ UPDATE t1 SET c = 'updated' WHERE a = 49
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 3, 'inserted');
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
BEGIN;
SELECT * FROM t1;
--send DELETE FROM t1 WHERE a = 490
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
SELECT * FROM t1;
--real_sleep 1
ROLLBACK;
SELECT * FROM t1;
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
--reap
SELECT * FROM t1;
COMMIT;
@@ -92,27 +97,27 @@ COMMIT;
BEGIN;
INSERT INTO t1 VALUES(490, 4, 'inserted');
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
BEGIN;
SELECT * FROM t1;
--send INSERT INTO t1 VALUES(490, 5, 'inserted')
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
--real_sleep 1
ROLLBACK;
SELECT * FROM t1;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
--reap
SELECT * FROM t1;
COMMIT;
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
# ---------------------------------------------
@@ -121,4 +126,5 @@ SELECT * FROM t1;
--echo # Switch to connection default
connection default;
disconnect conn1;
+disconnect conn2;
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_29151_C.test b/mysql-test/suite/falcon/t/falcon_bug_29151_C.test
--- a/mysql-test/suite/falcon/t/falcon_bug_29151_C.test 2007-11-04 18:35:58 +01:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_29151_C.test 2007-12-07 21:28:44 +01:00
@@ -2,7 +2,7 @@
#--disable_abort_on_error
#
-# Bug #29151: Falcon: running sysbench 0.4.8 leads to duplicate key errors duplicate key
+# Bug #29151: Falcon: running sysbench 0.4.8 leads to duplicate key errors
#
--echo *** Bug #29151 ***
@@ -10,7 +10,7 @@
--echo *** Initialization for 'InnoDB Compatibility Mode'
# -----------------------------------------------------
SET @@storage_engine = Falcon;
-SET GLOBAL FALCON_CONSISTENT_READ=OFF;
+SET GLOBAL falcon_consistent_read = off;
--disable_warnings
DROP TABLE IF EXISTS t1;
@@ -18,36 +18,41 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a int, b int, c char(10), PRIMARY KEY (a));
+# We need to set up an exlipicit connection here,
+# as SET GLOBAL does not set the current connection's setting.
--echo # Establish connection conn1
connect (conn1,localhost,root,,);
+
+--echo # Establish connection conn2
+connect (conn2,localhost,root,,);
INSERT INTO t1 VALUES(490, 0, 'inserted');
# -------------------------------------------------------
--echo *** Test if an UPDATE will get the new record after waiting
# -------------------------------------------------------
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
BEGIN;
UPDATE t1 SET c = 'updated' WHERE a = 490;
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 1, 'inserted');
SELECT * FROM t1;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
BEGIN;
SELECT * FROM t1;
# This one blocks until other transaction COMMITs.
--send UPDATE t1 SET c = 'updated' WHERE a = 490
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
--real_sleep 1
COMMIT;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
--reap
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 2, 'inserted');
@@ -63,20 +68,20 @@ UPDATE t1 SET c = 'updated' WHERE a = 49
DELETE FROM t1 WHERE a = 490;
INSERT INTO t1 VALUES(490, 3, 'inserted');
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
BEGIN;
SELECT * FROM t1;
--send DELETE FROM t1 WHERE a = 490
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
SELECT * FROM t1;
--real_sleep 1
COMMIT;
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
--reap
SELECT * FROM t1;
COMMIT;
@@ -94,26 +99,26 @@ UPDATE t1 SET c = 'updated' WHERE a = 49
DELETE FROM t1 WHERE a = 490;
SELECT * FROM t1;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
BEGIN;
SELECT * FROM t1;
--send INSERT INTO t1 VALUES(490, 5, 'inserted')
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
--real_sleep 1
COMMIT;
---echo # Switch to connection conn1
-connection conn1;
+--echo # Switch to connection conn2
+connection conn2;
--reap
SELECT * FROM t1;
COMMIT;
---echo # Switch to connection default
-connection default;
+--echo # Switch to connection conn1
+connection conn1;
SELECT * FROM t1;
# ---------------------------------------------
@@ -122,5 +127,6 @@ SELECT * FROM t1;
--echo # Switch to connection default
connection default;
disconnect conn1;
+disconnect conn2;
DROP TABLE t1;
-SET GLOBAL FALCON_CONSISTENT_READ=ON;
+SET GLOBAL falcon_consistent_read = on;
| Thread |
|---|
| • bk commit into 6.0 tree (hakank:1.2747) | Hakan Kuecuekyilmaz | 7 Dec |
