Below is the list of changes that have just been committed into a local
6.0-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-05-14 20:38:11+02:00, hakank@stripped +9 -0
Extended test case a bit.
mysql-test/r/falcon_bug_23689.result@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +31 -2
Extended test case a bit.
mysql-test/r/falcon_bug_24858.result@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +9 -1
Extended test case a bit.
mysql-test/r/falcon_bug_24921.result@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +1 -1
Cleanup.
mysql-test/r/falcon_bug_27697.result@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +11 -6
Extended test case a bit.
mysql-test/t/disabled.def@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +0 -4
Cleanup.
mysql-test/t/falcon_bug_23689.test@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +7 -2
Extended test case a bit.
mysql-test/t/falcon_bug_24858.test@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +5 -1
Extended test case a bit.
mysql-test/t/falcon_bug_24921.test@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +1 -1
Cleanup.
mysql-test/t/falcon_bug_27697.test@stripped, 2007-05-14 20:38:08+02:00, hakank@stripped +6 -5
Extended test case a bit.
# 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
--- 1.3/mysql-test/r/falcon_bug_27697.result 2007-04-07 15:40:43 +02:00
+++ 1.4/mysql-test/r/falcon_bug_27697.result 2007-05-14 20:38:08 +02:00
@@ -5,21 +5,26 @@
CREATE TABLE i (
i char(1) CHARACTER SET utf8 COLLATE utf8_turkish_ci
);
-INSERT INTO i VALUES ('i'),('ı');
-SELECT * FROM i WHERE i = 'i';
+INSERT INTO i VALUES ('i'), ('İ'), ('ı'), ('I');
+SELECT * FROM i WHERE i = 'i' ORDER BY i;
i
i
-SELECT * FROM i where i = 'I';
+İ
+SELECT * FROM i where i = 'I' ORDER BY i;
i
ı
+I
CREATE INDEX i ON i (i);
-SELECT * FROM i WHERE i = 'i';
+SELECT * FROM i WHERE i = 'i' ORDER BY i;
i
i
-SELECT * FROM i where i = 'I';
+İ
+SELECT * FROM i where i = 'I' ORDER BY i;
i
ı
+I
SELECT count(*) FROM i;
count(*)
-2
+4
DROP TABLE i;
+SET NAMES default;
--- 1.2/mysql-test/r/falcon_bug_23689.result 2007-05-09 21:27:58 +02:00
+++ 1.3/mysql-test/r/falcon_bug_23689.result 2007-05-14 20:38:08 +02:00
@@ -3,43 +3,72 @@
SET NAMES utf8;
SET STORAGE_ENGINE = MyISAM;
CREATE TABLE t1 (a char(5) character set latin1 collate latin1_german2_ci);
-INSERT INTO t1 VALUES ('UE'), (0xDC);
+INSERT INTO t1 VALUES ('UE'), ('ü'), (0xDC);
SELECT hex(a) FROM t1 WHERE a = 'UE';
hex(a)
5545
+FC
+DC
+SELECT hex(a) FROM t1 WHERE a = 'ü';
+hex(a)
+5545
+FC
DC
SELECT hex(a) FROM t1 WHERE a = 0xDC;
hex(a)
5545
+FC
DC
CREATE INDEX i1 on t1 (a);
SELECT hex(a) FROM t1 WHERE a = 'UE';
hex(a)
5545
+FC
+DC
+SELECT hex(a) FROM t1 WHERE a = 'ü';
+hex(a)
+5545
+FC
DC
SELECT hex(a) FROM t1 WHERE a = 0xDC;
hex(a)
5545
+FC
DC
DROP TABLE t1;
SET STORAGE_ENGINE = Falcon;
CREATE TABLE t1 (a char(5) character set latin1 collate latin1_german2_ci);
-INSERT INTO t1 VALUES ('UE'), (0xDC);
+INSERT INTO t1 VALUES ('UE'), ('ü'), (0xDC);
SELECT hex(a) FROM t1 WHERE a = 'UE';
hex(a)
5545
+FC
+DC
+SELECT hex(a) FROM t1 WHERE a = 'ü';
+hex(a)
+5545
+FC
DC
SELECT hex(a) FROM t1 WHERE a = 0xDC;
hex(a)
5545
+FC
DC
CREATE INDEX i1 on t1 (a);
SELECT hex(a) FROM t1 WHERE a = 'UE';
hex(a)
5545
+FC
+DC
+SELECT hex(a) FROM t1 WHERE a = 'ü';
+hex(a)
+5545
+FC
DC
SELECT hex(a) FROM t1 WHERE a = 0xDC;
hex(a)
5545
+FC
DC
DROP TABLE t1;
+SET NAMES default;
--- 1.1/mysql-test/r/falcon_bug_24858.result 2006-12-07 11:41:38 +01:00
+++ 1.2/mysql-test/r/falcon_bug_24858.result 2007-05-14 20:38:08 +02:00
@@ -1,12 +1,20 @@
-SET storage_engine = Falcon;
+SET @@storage_engine = Falcon;
*** Bug #24858 ***
DROP TABLE IF EXISTS t1;
SET NAMES utf8;
CREATE TABLE t1 (a char(5) character set utf8);
CREATE INDEX i on t1 (a(3));
INSERT INTO t1 VALUES ('abÜde');
+INSERT INTO t1 VALUES ('Ü');
SELECT * FROM t1 WHERE a = 'abÜde';
a
abÜde
+SELECT * FROM t1 WHERE a = 'Ü';
+a
+Ü
+SELECT * FROM t1 WHERE a LIKE '%Ü%';
+a
+abÜde
+Ü
DROP TABLE t1;
SET NAMES default;
--- 1.1/mysql-test/r/falcon_bug_24921.result 2006-12-10 20:35:36 +01:00
+++ 1.2/mysql-test/r/falcon_bug_24921.result 2007-05-14 20:38:08 +02:00
@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE = Falcon;
+SET @@storage_engine = Falcon;
*** Bug #24921 ***
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a char(4) CHARACTER SET utf8 COLLATE utf8_turkish_ci, KEY (a));
--- 1.3/mysql-test/t/falcon_bug_27697.test 2007-04-07 15:40:43 +02:00
+++ 1.4/mysql-test/t/falcon_bug_27697.test 2007-05-14 20:38:08 +02:00
@@ -17,18 +17,18 @@
CREATE TABLE i (
i char(1) CHARACTER SET utf8 COLLATE utf8_turkish_ci
);
-INSERT INTO i VALUES ('i'),('ı');
+INSERT INTO i VALUES ('i'), ('İ'), ('ı'), ('I');
# ----------------------------------------------------- #
# --- Test --- #
# ----------------------------------------------------- #
-SELECT * FROM i WHERE i = 'i';
-SELECT * FROM i where i = 'I';
+SELECT * FROM i WHERE i = 'i' ORDER BY i;
+SELECT * FROM i where i = 'I' ORDER BY i;
CREATE INDEX i ON i (i);
-SELECT * FROM i WHERE i = 'i';
-SELECT * FROM i where i = 'I';
+SELECT * FROM i WHERE i = 'i' ORDER BY i;
+SELECT * FROM i where i = 'I' ORDER BY i;
# ----------------------------------------------------- #
# --- Check --- #
@@ -39,3 +39,4 @@
# --- Final cleanup --- #
# ----------------------------------------------------- #
DROP TABLE i;
+SET NAMES default;
--- 1.2/mysql-test/t/falcon_bug_23689.test 2007-05-09 21:28:27 +02:00
+++ 1.3/mysql-test/t/falcon_bug_23689.test 2007-05-14 20:38:08 +02:00
@@ -10,23 +10,28 @@
SET STORAGE_ENGINE = MyISAM;
CREATE TABLE t1 (a char(5) character set latin1 collate latin1_german2_ci);
-INSERT INTO t1 VALUES ('UE'), (0xDC);
+INSERT INTO t1 VALUES ('UE'), ('ü'), (0xDC);
SELECT hex(a) FROM t1 WHERE a = 'UE';
+SELECT hex(a) FROM t1 WHERE a = 'ü';
SELECT hex(a) FROM t1 WHERE a = 0xDC;
CREATE INDEX i1 on t1 (a);
SELECT hex(a) FROM t1 WHERE a = 'UE';
+SELECT hex(a) FROM t1 WHERE a = 'ü';
SELECT hex(a) FROM t1 WHERE a = 0xDC;
DROP TABLE t1;
SET STORAGE_ENGINE = Falcon;
CREATE TABLE t1 (a char(5) character set latin1 collate latin1_german2_ci);
-INSERT INTO t1 VALUES ('UE'), (0xDC);
+INSERT INTO t1 VALUES ('UE'), ('ü'), (0xDC);
SELECT hex(a) FROM t1 WHERE a = 'UE';
+SELECT hex(a) FROM t1 WHERE a = 'ü';
SELECT hex(a) FROM t1 WHERE a = 0xDC;
CREATE INDEX i1 on t1 (a);
SELECT hex(a) FROM t1 WHERE a = 'UE';
+SELECT hex(a) FROM t1 WHERE a = 'ü';
SELECT hex(a) FROM t1 WHERE a = 0xDC;
# Final cleanup.
DROP TABLE t1;
+SET NAMES default;
--- 1.1/mysql-test/t/falcon_bug_24858.test 2006-12-07 12:02:18 +01:00
+++ 1.2/mysql-test/t/falcon_bug_24858.test 2007-05-14 20:38:08 +02:00
@@ -1,4 +1,4 @@
-SET storage_engine = Falcon;
+SET @@storage_engine = Falcon;
#
# Bug #24858: Falcon: searches fail if partial index on utf8 column
#
@@ -11,8 +11,12 @@
CREATE TABLE t1 (a char(5) character set utf8);
CREATE INDEX i on t1 (a(3));
INSERT INTO t1 VALUES ('abÜde');
+INSERT INTO t1 VALUES ('Ü');
SELECT * FROM t1 WHERE a = 'abÜde';
+SELECT * FROM t1 WHERE a = 'Ü';
+SELECT * FROM t1 WHERE a LIKE '%Ü%';
+
# Final cleanup.
DROP TABLE t1;
--- 1.1/mysql-test/t/falcon_bug_24921.test 2006-12-10 20:35:36 +01:00
+++ 1.2/mysql-test/t/falcon_bug_24921.test 2007-05-14 20:38:08 +02:00
@@ -1,4 +1,4 @@
-SET STORAGE_ENGINE = Falcon;
+SET @@storage_engine = Falcon;
#
# Bug #24921: LIKE searches fail if index on utf8 column
#
--- 1.321/mysql-test/t/disabled.def 2007-05-03 21:18:46 +02:00
+++ 1.322/mysql-test/t/disabled.def 2007-05-14 20:38:08 +02:00
@@ -59,18 +59,14 @@
falcon_bug_22125 : Bug#22125 2006-09-13 hakank (Get pushbuild green)
falcon_bug_22564 : Bug#22564 2006-10-07 hakank (Get pushbuild green)
falcon_bug_22845 : Bug#22845 2006-10-07 hakank Currently hangs
-falcon_bug_22847 : Bug#22847 2006-10-03 hakank Currently hangs
falcon_bug_23692 : Bug#23692 2006-10-27 hakank Currently failing
falcon_bug_24024 : Bug#24024 2006-12-05 ML (Get pushbuild green)
-falcon_bug_24921 : Bug#24921 2006-12-10 hakank Currently failing
-falcon_bug_26057 : Bug#26057 2007-01-11 hakank Currently failing
falcon_bug_26058 : Bug#26058 2007-05-03 hakank Currently failing
falcon_bug_26433 : Bug#26433 2007-02-16 hakank Currently failing
falcon_bug_26607 : Bug#26607 2007-02-23 hakank Currently failing
falcon_bug_26827 : Bug#26827 2007-03-04 hakank Currently failing
falcon_bug_27350 : Bug#27350 2007-03-23 hakank Currently failing
falcon_bug_27426 : Bug#27426 2007-03-27 hakank Currently failing
-falcon_bug_27697 : Bug#27697 2007-04-07 hakank Currently failing
falcon_bug_27997 : Bug#27997 2007-04-21 hakank Currently failing
falcon_bug_28026 : Bug#28026 2007-04-25 hakank Currently failing
falcon_bug_28158 : Bug#28158 2007-05-02 hakank Currently failing
| Thread |
|---|
| • bk commit into 6.0-falcon tree (hakank:1.2523) | Hakan Kuecuekyilmaz | 16 May |
