From cd1b00e8bba562e579a03ef1882240d0cb9b73ac Mon Sep 17 00:00:00 2001
From: "istruewing@stella.local" <>
Date: Tue, 18 Dec 2007 12:29:50 +0100
Subject: [PATCH 1/2] Bug#32705 - myisam corruption: Key in wrong position     
        at page 1024 with ucs2_bin

Inserting strings with a common prefix into a table with
characterset UCS2 corrupted the table.

An efficient search method was used, which compares end space
with ASCII blank. This doesn't work for character sets like UCS2,
which do not encode blank like ASCII does.

Use the less efficient search method _mi_seq_search()
for charsets with mbminlen > 1.
---
 myisam/mi_open.c           | 11 ++++++++++-
 mysql-test/r/myisam.result | 10 ++++++++++
 mysql-test/t/myisam.test   | 13 +++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index ec169ac8785..5314d6a9a6c 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -791,8 +791,17 @@ static void setup_key_functions(register MI_KEYDEF *keyinfo)
     keyinfo->get_key= _mi_get_pack_key;
     if (keyinfo->seg[0].flag & HA_PACK_KEY)
     {						/* Prefix compression */
+      /*
+        _mi_prefix_search() compares end-space against ASCII blank (' ').
+        It cannot be used for character sets, that do not encode the
+        blank character like ASCII does. UCS2 is an example. All
+        character sets with a fixed width > 1 or a mimimum width > 1
+        cannot represent blank like ASCII does. In these cases we have
+        to use _mi_seq_search() for the search.
+      */
       if (!keyinfo->seg->charset || use_strnxfrm(keyinfo->seg->charset) ||
-          (keyinfo->seg->flag & HA_NULL_PART))
+          (keyinfo->seg->flag & HA_NULL_PART) ||
+          (keyinfo->seg->charset->mbminlen > 1))
         keyinfo->bin_search=_mi_seq_search;
       else
         keyinfo->bin_search=_mi_prefix_search;
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 56933f45fbf..4ff7441c02e 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -1839,4 +1839,14 @@ CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 DROP TABLE t1;
+CREATE TABLE t1 (
+c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,
+KEY(c1)
+) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('marshall\'s');
+INSERT INTO t1 VALUES ('marsh');
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 80c7a92c12f..b182c35514c 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -1193,4 +1193,17 @@ SET @@myisam_repair_threads=1;
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
 
+#
+# Bug#32705 - myisam corruption: Key in wrong position
+#             at page 1024 with ucs2_bin
+#
+CREATE TABLE t1 (
+  c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,
+  KEY(c1)
+  ) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('marshall\'s');
+INSERT INTO t1 VALUES ('marsh');
+CHECK TABLE t1 EXTENDED;
+DROP TABLE t1;
+
 --echo End of 5.0 tests

From b53d161c7f97d1eb55465535db1654e0afdfcad4 Mon Sep 17 00:00:00 2001
From: "istruewing@stella.local" <>
Date: Wed, 16 Jan 2008 11:48:04 +0100
Subject: [PATCH 2/2] Bug#32705 - myisam corruption: Key in wrong position     
        at page 1024 with ucs2_bin Post-pushbuild fix. Moved test from
 myisam.test to ctype_ucs2_def.test. UCS2 is not always available.

---
 mysql-test/r/ctype_ucs2_def.result | 10 ++++++++++
 mysql-test/r/myisam.result         | 10 ----------
 mysql-test/t/ctype_ucs2_def.test   | 13 +++++++++++++
 mysql-test/t/myisam.test           | 13 -------------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/mysql-test/r/ctype_ucs2_def.result b/mysql-test/r/ctype_ucs2_def.result
index d838c5d66b0..1bbb354798b 100644
--- a/mysql-test/r/ctype_ucs2_def.result
+++ b/mysql-test/r/ctype_ucs2_def.result
@@ -21,4 +21,14 @@ INSERT INTO t1 VALUES('A', 'A'), ('B', 'B'), ('C', 'C');
 INSERT INTO t1 VALUES('A ', 'A ');
 ERROR 23000: Duplicate entry '' for key 1
 DROP TABLE t1;
+CREATE TABLE t1 (
+c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,
+KEY(c1)
+) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('marshall\'s');
+INSERT INTO t1 VALUES ('marsh');
+CHECK TABLE t1 EXTENDED;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index 4ff7441c02e..56933f45fbf 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -1839,14 +1839,4 @@ CHECK TABLE t1 EXTENDED;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 DROP TABLE t1;
-CREATE TABLE t1 (
-c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,
-KEY(c1)
-) ENGINE=MyISAM;
-INSERT INTO t1 VALUES ('marshall\'s');
-INSERT INTO t1 VALUES ('marsh');
-CHECK TABLE t1 EXTENDED;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/t/ctype_ucs2_def.test b/mysql-test/t/ctype_ucs2_def.test
index c80444daddd..b146dc63626 100644
--- a/mysql-test/t/ctype_ucs2_def.test
+++ b/mysql-test/t/ctype_ucs2_def.test
@@ -39,4 +39,17 @@ INSERT INTO t1 VALUES('A', 'A'), ('B', 'B'), ('C', 'C');
 INSERT INTO t1 VALUES('A ', 'A ');
 DROP TABLE t1;
 
+#
+# Bug#32705 - myisam corruption: Key in wrong position
+#             at page 1024 with ucs2_bin
+#
+CREATE TABLE t1 (
+  c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,
+  KEY(c1)
+  ) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('marshall\'s');
+INSERT INTO t1 VALUES ('marsh');
+CHECK TABLE t1 EXTENDED;
+DROP TABLE t1;
+
 --echo End of 5.0 tests
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index b182c35514c..80c7a92c12f 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -1193,17 +1193,4 @@ SET @@myisam_repair_threads=1;
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
 
-#
-# Bug#32705 - myisam corruption: Key in wrong position
-#             at page 1024 with ucs2_bin
-#
-CREATE TABLE t1 (
-  c1 CHAR(255) CHARACTER SET UCS2 COLLATE UCS2_BIN NOT NULL,
-  KEY(c1)
-  ) ENGINE=MyISAM;
-INSERT INTO t1 VALUES ('marshall\'s');
-INSERT INTO t1 VALUES ('marsh');
-CHECK TABLE t1 EXTENDED;
-DROP TABLE t1;
-
 --echo End of 5.0 tests