bk commit into 6.0 tree (hakank:1.2635)

[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-22 11:27:14+02:00, hakank@lu0011.(none) +3 -0
  disabled falcon_bug_28095 due to missing feature in mysql-test-run.pl.
  Test will be enabled later again.

  mysql-test/suite/falcon/t/disabled.def@stripped, 2008-04-22 11:27:09+02:00,
hakank@lu0011.(none) +2 -14
    disabled falcon_bug_28095 due to missing feature in mysql-test-run.pl.
    Test will be enabled later again.

  mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result@stripped, 2008-04-22 09:36:09+02:00,
hakank@lu0011.(none) +0 -0
    Rename: mysql-test/suite/falcon/r/falcon_bug_34351_B.result ->
mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result

  mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test@stripped, 2008-04-22 09:35:51+02:00,
hakank@lu0011.(none) +0 -0
    Rename: mysql-test/suite/falcon/t/falcon_bug_34351_B.test ->
mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_34351_B.result
b/mysql-test/suite/falcon/r/falcon_bug_34351_B.result
--- a/mysql-test/suite/falcon/r/falcon_bug_34351_B.result	2008-03-28 18:03:07 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,101 +0,0 @@
-*** Bug #34351_B ***
-SET @@storage_engine = 'Falcon';
-DROP TABLE IF EXISTS t1;
-# Establish connection conn1 (user = root)
-SET @@autocommit = 1;
-# Switch to connection default
-SET @@autocommit = 1;
-CREATE TABLE t1 (
-t1_autoinc INTEGER NOT NULL AUTO_INCREMENT,
-t1_uuid CHAR(36),
-PRIMARY KEY (t1_autoinc), KEY (t1_uuid)
-) ENGINE = Falcon;
-# Test #1  Filter on UUID Without a transaction
-SET @default_uuid = UUID();
-INSERT INTO t1 (t1_uuid) VALUES (@default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-1
-START TRANSACTION;
-DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
-# Switch to connection conn1
-SET @conn1_uuid = UUID();
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-1
-INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-1
-2
-DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid);
-# Switch to connection default
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-COMMIT;
-# Switch to connection conn1
-ERROR HY000: Record has changed since last read in table 't1'
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-2
-DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-# Test #2 Filter on UUID With a transaction
-# Switch to connection default
-START TRANSACTION;
-SET @default_uuid = UUID();
-INSERT INTO t1 (t1_uuid) VALUES (@default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-3
-DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-# Switch to connection conn1
-SET @conn1_uuid = UUID();
-START TRANSACTION;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-4
-DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid);
-# Switch to connection default
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-COMMIT;
-# Switch to connection conn1
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-COMMIT;
-# Test #3 Filter on INT With a transaction
-# Switch to connection default
-START TRANSACTION;
-SET @default_uuid = UUID();
-INSERT INTO t1 VALUES (11, @default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-11
-DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-# Switch to connection conn1
-SET @conn1_uuid = UUID();
-INSERT INTO t1 VALUES (12, @conn1_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-12
-DELETE FROM t1 WHERE t1_autoinc = 12;
-# Switch to connection default
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-COMMIT;
-# Switch to connection conn1
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-# Switch to connection default
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-t1_autoinc
-DROP TABLE IF EXISTS t1;
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	2008-04-20 10:30:41 +02:00
+++ b/mysql-test/suite/falcon/t/disabled.def	2008-04-22 11:27:09 +02:00
@@ -10,17 +10,5 @@
 #
 ##############################################################################
 
-#falcon_bug_22150    : Bug#34890 2008-02-27 hakank Open bug
-#falcon_bug_22173    : Bug#35656 2008-04-10 hakank Some Falcon tests fail sporadically
-#falcon_bug_22182    : Disabled until runtime team provides RENAME DATABASE replacement.
See WL#4030
-#falcon_bug_22185    : Bug#34890 2008-03-07 hakank Bogus timeout problem
-#falcon_bug_26433    : Bug#32697 falcon_bug_26433.test fails randomly
-#falcon_bug_27951    : Bug#32731 falcon_bug_27951 fails randomly
-#falcon_bug_28095_I  : Bug#35656 2008-03-27 hakank Some Falcon tests fail sporadically
-#falcon_bug_28095_II : Bug#35656 2008-03-27 hakank Some Falcon tests fail sporadically
-#falcon_bug_29246    : Bug#29246 2007-06-21 hakank Currently failing
-#falcon_bug_30124    : Bug#35656 2008-03-27 hakank Some Falcon tests fail sporadically
-#falcon_bug_34351_B  : Bug#35656 2008-03-27 hakank Some Falcon tests fail sporadically
-#falcon_bug_34351_C  : Bug#35503 2008-03-22 hakank Times out from time to time
-#falcon_bug_34890    : Bug#34890 2008-02-11 klewis shows a faux lock timeout
-#falcon_record_cache_memory_leak2    : Bug#34894 2008-02-27 hakank Fails on Pushbuild
Windows
+falcon_bug_28095_I  : Bug#xxxxx 2008-04-22 hakank Disabled until soft restart is in main
tree
+falcon_bug_28095_II : Bug#xxxxx 2008-03-22 hakank Disabled until soft restart is in main
tree
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_34351_B.test
b/mysql-test/suite/falcon/t/falcon_bug_34351_B.test
--- a/mysql-test/suite/falcon/t/falcon_bug_34351_B.test	2008-03-28 18:02:22 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,140 +0,0 @@
---source include/have_falcon.inc
-#--disable_abort_on_error
-#
-# Bug #34351_B: Update Conflict on non-overlapping transactions
-#
---echo *** Bug #34351_B ***
-
-# ----------------------------------------------------- #
-# --- Initialisation                                --- #
-# ----------------------------------------------------- #
-let $engine = 'Falcon';
-eval SET @@storage_engine = $engine;
-
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
---echo # Establish connection conn1 (user = root)
-connect (conn1,localhost,root,,);
-SET @@autocommit = 1;
-
---echo # Switch to connection default
-connection default;
-SET @@autocommit = 1;
-
-CREATE TABLE t1 (
-  t1_autoinc INTEGER NOT NULL AUTO_INCREMENT,
-  t1_uuid CHAR(36),
-  PRIMARY KEY (t1_autoinc), KEY (t1_uuid)
-) ENGINE = Falcon;
-
-# ----------------------------------------------------- #
-# --- Test #1  Filter on UUID Without a transaction --- #
-# ----------------------------------------------------- #
-
---echo # Test #1  Filter on UUID Without a transaction
-SET @default_uuid = UUID();
-INSERT INTO t1 (t1_uuid) VALUES (@default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-START TRANSACTION;
-DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
-
---echo # Switch to connection conn1
-connection conn1;
-SET @conn1_uuid = UUID();
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
---send DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid)
-
---echo # Switch to connection default
-connection default;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-COMMIT;
-
---echo # Switch to connection conn1
-connection conn1;
---error 1020
-reap;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-
-# ----------------------------------------------------- #
-# --- Test #2 Filter on UUID With a transaction     --- #
-# ----------------------------------------------------- #
-
---echo # Test #2 Filter on UUID With a transaction
---echo # Switch to connection default
-connection default;
-START TRANSACTION;
-SET @default_uuid = UUID();
-INSERT INTO t1 (t1_uuid) VALUES (@default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-
---echo # Switch to connection conn1
-connection conn1;
-SET @conn1_uuid = UUID();
-START TRANSACTION;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
---send DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid)
-
---echo # Switch to connection default
-connection default;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-COMMIT;
-
---echo # Switch to connection conn1
-connection conn1;
-reap;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-COMMIT;
-
-
-# ----------------------------------------------------- #
-# --- Test #3 Filter on INT Without a transaction   --- #
-# ----------------------------------------------------- #
---echo # Test #3 Filter on INT With a transaction
---echo # Switch to connection default
-connection default;
-START TRANSACTION;
-SET @default_uuid = UUID();
-INSERT INTO t1 VALUES (11, @default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-
---echo # Switch to connection conn1
-connection conn1;
-SET @conn1_uuid = UUID();
-INSERT INTO t1 VALUES (12, @conn1_uuid);
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-DELETE FROM t1 WHERE t1_autoinc = 12;
-
---echo # Switch to connection default
-connection default;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-COMMIT;
-
-# ----------------------------------------------------- #
-# --- Check                                         --- #
-# ----------------------------------------------------- #
-
---echo # Switch to connection conn1
-connection conn1;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-
---echo # Switch to connection default
-connection default;
-SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
-
-# ----------------------------------------------------- #
-# --- Final cleanup                                 --- #
-# ----------------------------------------------------- #
-disconnect conn1;
-DROP TABLE IF EXISTS t1;
diff -Nrup a/mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result
b/mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result	2008-04-22 09:36:09 +02:00
@@ -0,0 +1,101 @@
+*** Bug #34351_B ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+# Establish connection conn1 (user = root)
+SET @@autocommit = 1;
+# Switch to connection default
+SET @@autocommit = 1;
+CREATE TABLE t1 (
+t1_autoinc INTEGER NOT NULL AUTO_INCREMENT,
+t1_uuid CHAR(36),
+PRIMARY KEY (t1_autoinc), KEY (t1_uuid)
+) ENGINE = Falcon;
+# Test #1  Filter on UUID Without a transaction
+SET @default_uuid = UUID();
+INSERT INTO t1 (t1_uuid) VALUES (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+1
+START TRANSACTION;
+DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
+# Switch to connection conn1
+SET @conn1_uuid = UUID();
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+1
+INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+1
+2
+DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid);
+# Switch to connection default
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+COMMIT;
+# Switch to connection conn1
+ERROR HY000: Record has changed since last read in table 't1'
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+2
+DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+# Test #2 Filter on UUID With a transaction
+# Switch to connection default
+START TRANSACTION;
+SET @default_uuid = UUID();
+INSERT INTO t1 (t1_uuid) VALUES (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+3
+DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+# Switch to connection conn1
+SET @conn1_uuid = UUID();
+START TRANSACTION;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+4
+DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid);
+# Switch to connection default
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+COMMIT;
+# Switch to connection conn1
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+COMMIT;
+# Test #3 Filter on INT With a transaction
+# Switch to connection default
+START TRANSACTION;
+SET @default_uuid = UUID();
+INSERT INTO t1 VALUES (11, @default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+11
+DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+# Switch to connection conn1
+SET @conn1_uuid = UUID();
+INSERT INTO t1 VALUES (12, @conn1_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+12
+DELETE FROM t1 WHERE t1_autoinc = 12;
+# Switch to connection default
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+COMMIT;
+# Switch to connection conn1
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+# Switch to connection default
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+t1_autoinc
+DROP TABLE IF EXISTS t1;
diff -Nrup a/mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test
b/mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test	2008-04-22 09:35:51 +02:00
@@ -0,0 +1,140 @@
+--source include/have_falcon.inc
+#--disable_abort_on_error
+#
+# Bug #34351_B: Update Conflict on non-overlapping transactions
+#
+--echo *** Bug #34351_B ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+--echo # Establish connection conn1 (user = root)
+connect (conn1,localhost,root,,);
+SET @@autocommit = 1;
+
+--echo # Switch to connection default
+connection default;
+SET @@autocommit = 1;
+
+CREATE TABLE t1 (
+  t1_autoinc INTEGER NOT NULL AUTO_INCREMENT,
+  t1_uuid CHAR(36),
+  PRIMARY KEY (t1_autoinc), KEY (t1_uuid)
+) ENGINE = Falcon;
+
+# ----------------------------------------------------- #
+# --- Test #1  Filter on UUID Without a transaction --- #
+# ----------------------------------------------------- #
+
+--echo # Test #1  Filter on UUID Without a transaction
+SET @default_uuid = UUID();
+INSERT INTO t1 (t1_uuid) VALUES (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+START TRANSACTION;
+DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
+
+--echo # Switch to connection conn1
+connection conn1;
+SET @conn1_uuid = UUID();
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+--send DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid)
+
+--echo # Switch to connection default
+connection default;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+COMMIT;
+
+--echo # Switch to connection conn1
+connection conn1;
+--error 1020
+reap;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+
+# ----------------------------------------------------- #
+# --- Test #2 Filter on UUID With a transaction     --- #
+# ----------------------------------------------------- #
+
+--echo # Test #2 Filter on UUID With a transaction
+--echo # Switch to connection default
+connection default;
+START TRANSACTION;
+SET @default_uuid = UUID();
+INSERT INTO t1 (t1_uuid) VALUES (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+
+--echo # Switch to connection conn1
+connection conn1;
+SET @conn1_uuid = UUID();
+START TRANSACTION;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+INSERT INTO t1 (t1_uuid) VALUES (@conn1_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+--send DELETE FROM t1 WHERE t1_uuid = (@conn1_uuid)
+
+--echo # Switch to connection default
+connection default;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+COMMIT;
+
+--echo # Switch to connection conn1
+connection conn1;
+reap;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+COMMIT;
+
+
+# ----------------------------------------------------- #
+# --- Test #3 Filter on INT Without a transaction   --- #
+# ----------------------------------------------------- #
+--echo # Test #3 Filter on INT With a transaction
+--echo # Switch to connection default
+connection default;
+START TRANSACTION;
+SET @default_uuid = UUID();
+INSERT INTO t1 VALUES (11, @default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+DELETE FROM t1 WHERE t1_uuid = (@default_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+
+--echo # Switch to connection conn1
+connection conn1;
+SET @conn1_uuid = UUID();
+INSERT INTO t1 VALUES (12, @conn1_uuid);
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+DELETE FROM t1 WHERE t1_autoinc = 12;
+
+--echo # Switch to connection default
+connection default;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+COMMIT;
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+
+--echo # Switch to connection conn1
+connection conn1;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+
+--echo # Switch to connection default
+connection default;
+SELECT t1_autoinc FROM t1 ORDER BY t1_autoinc;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+disconnect conn1;
+DROP TABLE IF EXISTS t1;