bk commit into 5.1 tree (istruewing:1.2654) BUG#32705

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing.  When istruewing 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-01-16 15:38:40+01:00, istruewing@stripped +1 -0
  Bug#32705 - myisam corruption: Key in wrong position
              at page 1024 with ucs2_bin
  Post merge fix

  mysql-test/r/myisam.result@stripped, 2008-01-16 15:38:39+01:00, istruewing@stripped +0 -10
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Post merge fix

diff -Nrup a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
--- a/mysql-test/r/myisam.result	2008-01-16 13:53:42 +01:00
+++ b/mysql-test/r/myisam.result	2008-01-16 15:38:39 +01:00
@@ -1809,16 +1809,6 @@ 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;
 CREATE TABLE t1 (id int NOT NULL, ref int NOT NULL, INDEX (id)) ENGINE=MyISAM;
 CREATE TABLE t2 LIKE t1;
 INSERT INTO t2 (id, ref) VALUES (1,3), (2,1), (3,2), (4,5), (4,4);