Below is the list of changes that have just been committed into a local
6.0 repository of vvaintroub. When vvaintroub 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-28 13:21:52+02:00, vvaintroub@wva. +4 -0
- Delete falcon_bug_26058 - does not test anything, really
(was testing for warnings coming from invalid input)
- Correct falcon_bug_22189- it was timing dependent
BitKeeper/deleted/.del-falcon_bug_26058.result@stripped, 2008-04-28 11:31:38+02:00, vvaintroub@wva. +0 -0
Delete: mysql-test/suite/falcon_team/r/falcon_bug_26058.result
BitKeeper/deleted/.del-falcon_bug_26058.test@stripped, 2008-04-28 11:31:25+02:00, vvaintroub@wva. +0 -0
Delete: mysql-test/suite/falcon_team/t/falcon_bug_26058.test
mysql-test/suite/falcon_team/r/falcon_bug_22189.result@stripped, 2008-04-28 13:21:43+02:00, vvaintroub@wva. +1 -0
correct test case, it was timing-dependent
mysql-test/suite/falcon_team/t/falcon_bug_22189.test@stripped, 2008-04-28 13:21:44+02:00, vvaintroub@wva. +6 -1
correct test case, it was timing dependent
diff -Nrup a/mysql-test/suite/falcon_team/r/falcon_bug_22189.result b/mysql-test/suite/falcon_team/r/falcon_bug_22189.result
--- a/mysql-test/suite/falcon_team/r/falcon_bug_22189.result 2008-04-21 15:11:27 +02:00
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_22189.result 2008-04-28 13:21:43 +02:00
@@ -24,6 +24,7 @@ ERROR 23000: Duplicate entry '1' for key
INSERT INTO x1 VALUES (0,3);
# Switch to connection default
ROLLBACK;
+# Switch to connection conn1
UPDATE x1 SET x1 = 1, x2 = 4;
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
SELECT * FROM x1;
diff -Nrup a/mysql-test/suite/falcon_team/r/falcon_bug_26058.result b/mysql-test/suite/falcon_team/r/falcon_bug_26058.result
--- a/mysql-test/suite/falcon_team/r/falcon_bug_26058.result 2008-04-20 01:07:39 +02:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,13 +0,0 @@
-*** Bug #26058 ***
-SET @@storage_engine = 'Falcon';
-DROP TABLE IF EXISTS t1;
-SET NAMES utf8;
-CREATE TABLE t1 (a varchar(5) character set ujis);
-INSERT INTO t1 values ('¥'),('‾');
-SELECT count(*) FROM t1 WHERE a IS NOT NULL;
-count(*)
-2
-SELECT count(*) FROM t1;
-count(*)
-2
-DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon_team/t/falcon_bug_22189.test b/mysql-test/suite/falcon_team/t/falcon_bug_22189.test
--- a/mysql-test/suite/falcon_team/t/falcon_bug_22189.test 2008-04-21 15:11:27 +02:00
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_22189.test 2008-04-28 13:21:44 +02:00
@@ -55,6 +55,12 @@ connection conn1;
--echo # Switch to connection default
connection default;
ROLLBACK;
+
+--echo # Switch to connection conn1
+connection conn1;
+--reap
+
+connection default;
--error ER_DUP_ENTRY
UPDATE x1 SET x1 = 1, x2 = 4;
--sorted_result
@@ -62,7 +68,6 @@ SELECT * FROM x1;
--echo # Switch to connection conn1
connection conn1;
---reap
--send UPDATE x1 SET x1 = 0, x2 = 5
--send INSERT INTO x1 VALUES (0,6)
diff -Nrup a/mysql-test/suite/falcon_team/t/falcon_bug_26058.test b/mysql-test/suite/falcon_team/t/falcon_bug_26058.test
--- a/mysql-test/suite/falcon_team/t/falcon_bug_26058.test 2008-04-20 01:03:55 +02:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,34 +0,0 @@
---source include/have_falcon.inc
-#
-# Bug #26058: Falcon: warnings with yen sign and overline in ujis
-#
---echo *** Bug #26058 ***
-
-# ----------------------------------------------------- #
-# --- Initialisation --- #
-# ----------------------------------------------------- #
-let $engine = 'Falcon';
-eval SET @@storage_engine = $engine;
-
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
-SET NAMES utf8;
-CREATE TABLE t1 (a varchar(5) character set ujis);
-INSERT INTO t1 values ('¥'),('‾');
-
-# ----------------------------------------------------- #
-# --- Test --- #
-# ----------------------------------------------------- #
-SELECT count(*) FROM t1 WHERE a IS NOT NULL;
-
-# ----------------------------------------------------- #
-# --- Check --- #
-# ----------------------------------------------------- #
-SELECT count(*) FROM t1;
-
-# ----------------------------------------------------- #
-# --- Final cleanup --- #
-# ----------------------------------------------------- #
-DROP TABLE t1;
