From: Date: April 7 2007 4:54pm Subject: bk commit into 5.1-falcon tree (hakank:1.2569) BUG#26803 List-Archive: http://lists.mysql.com/commits/24021 X-Bug: 26803 Message-Id: <20070407145437.71F5C2043FB@lu0011.wdf.sap.corp> Below is the list of changes that have just been committed into a local 5.1-falcon 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-04-07 16:54:31+02:00, hakank@stripped +2 -0 Test for fixed BUG#26803. mysql-test/r/falcon_bug_26803.result@stripped, 2007-04-07 16:54:28+02:00, hakank@stripped +24 -0 Test for fixed BUG#26803. mysql-test/r/falcon_bug_26803.result@stripped, 2007-04-07 16:54:28+02:00, hakank@stripped +0 -0 mysql-test/t/falcon_bug_26803.test@stripped, 2007-04-07 16:54:28+02:00, hakank@stripped +44 -0 Test for fixed BUG#26803. mysql-test/t/falcon_bug_26803.test@stripped, 2007-04-07 16:54:28+02:00, hakank@stripped +0 -0 # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: hakank # Host: lu0011.wdf.sap.corp # Root: /home/hakan/work/mysql/mysql-5.1-falcon --- New file --- +++ mysql-test/r/falcon_bug_26803.result 07/04/07 16:54:28 *** Bug #26803 *** SET @@storage_engine = 'Falcon'; DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( a varchar(5), b varchar(5) ); CREATE UNIQUE INDEX i1 ON t1 (a, b); INSERT INTO t1 VALUES ('y', 'y'); INSERT INTO t1 VALUES ('y', 'y'); ERROR 23000: Duplicate entry 'y-y' for key 'i1' INSERT INTO t1 VALUES ('y ', 'y'); ERROR 23000: Duplicate entry 'y -y' for key 'i1' INSERT INTO t1 VALUES ('y', 'y '); ERROR 23000: Duplicate entry 'y-y ' for key 'i1' INSERT INTO t1 VALUES ('y ', 'y '); ERROR 23000: Duplicate entry 'y -y ' for key 'i1' SELECT count(*) FROM t1; count(*) 1 SELECT count(*) FROM t1 WHERE a = 'y' AND b ='y'; count(*) 1 DROP TABLE t1; --- New file --- +++ mysql-test/t/falcon_bug_26803.test 07/04/07 16:54:28 # # Bug #26803: unique constraints on VARCHAR columns behave different in MyISAM and Falcon # --echo *** Bug #26803 *** # ----------------------------------------------------- # # --- Initialisation --- # # ----------------------------------------------------- # let $engine = 'Falcon'; eval SET @@storage_engine = $engine; --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings CREATE TABLE t1 ( a varchar(5), b varchar(5) ); CREATE UNIQUE INDEX i1 ON t1 (a, b); INSERT INTO t1 VALUES ('y', 'y'); # ----------------------------------------------------- # # --- Test --- # # ----------------------------------------------------- # --error 1582 INSERT INTO t1 VALUES ('y', 'y'); --error 1582 INSERT INTO t1 VALUES ('y ', 'y'); --error 1582 INSERT INTO t1 VALUES ('y', 'y '); --error 1582 INSERT INTO t1 VALUES ('y ', 'y '); # ----------------------------------------------------- # # --- Check --- # # ----------------------------------------------------- # SELECT count(*) FROM t1; SELECT count(*) FROM t1 WHERE a = 'y' AND b ='y'; # ----------------------------------------------------- # # --- Final cleanup --- # # ----------------------------------------------------- # DROP TABLE t1;