bk commit into 5.0 tree (istruewing:1.2580) BUG#32705

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.0 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 11:48:04+01:00, istruewing@stripped +4 -0
  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@stripped, 2008-01-16 11:48:03+01:00,
istruewing@stripped +10 -0
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Moved test result from myisam.result to here.

  mysql-test/r/myisam.result@stripped, 2008-01-16 11:48:03+01:00, istruewing@stripped +0
-10
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Moved test result from here to ctype_ucs2_def.result.

  mysql-test/t/ctype_ucs2_def.test@stripped, 2008-01-16 11:48:03+01:00, istruewing@stripped
+13 -0
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Moved test from myisam.test to here.
    UCS2 is not always available.

  mysql-test/t/myisam.test@stripped, 2008-01-16 11:48:03+01:00, istruewing@stripped +0 -13
    Bug#32705 - myisam corruption: Key in wrong position
                at page 1024 with ucs2_bin
    Moved test from here to ctype_ucs2_def.test.
    UCS2 is not always available.

diff -Nrup a/mysql-test/r/ctype_ucs2_def.result b/mysql-test/r/ctype_ucs2_def.result
--- a/mysql-test/r/ctype_ucs2_def.result	2007-06-22 14:28:24 +02:00
+++ b/mysql-test/r/ctype_ucs2_def.result	2008-01-16 11:48:03 +01:00
@@ -21,4 +21,14 @@ INSERT INTO t1 VALUES('A', 'A'), ('B', '
 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 -Nrup a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
--- a/mysql-test/r/myisam.result	2007-12-18 12:29:47 +01:00
+++ b/mysql-test/r/myisam.result	2008-01-16 11:48:03 +01:00
@@ -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 -Nrup a/mysql-test/t/ctype_ucs2_def.test b/mysql-test/t/ctype_ucs2_def.test
--- a/mysql-test/t/ctype_ucs2_def.test	2007-06-22 14:28:24 +02:00
+++ b/mysql-test/t/ctype_ucs2_def.test	2008-01-16 11:48:03 +01:00
@@ -39,4 +39,17 @@ INSERT INTO t1 VALUES('A', 'A'), ('B', '
 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 -Nrup a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
--- a/mysql-test/t/myisam.test	2007-12-18 12:29:47 +01:00
+++ b/mysql-test/t/myisam.test	2008-01-16 11:48:03 +01:00
@@ -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