Merge stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/ctype_ucs2_def.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/r/ctype_ucs2_def.result:
  SCCS merged
mysql-test/r/myisam.result:
  SCCS merged

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 'key1'
 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

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

mysql-test/t/myisam.test

@@ -1152,19 +1152,6 @@ 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;
-
 #
 # Bug#28837: MyISAM storage engine error (134) doing delete with self-join
 #