A fix for Bug#13337 "ps test fails if configure wo/ usc2"

mysql-test/r/ctype_ucs.result:
  Test results changed (Bug#13337)
mysql-test/r/ps.result:
  Test results changed (Bug#13337)
mysql-test/t/ctype_ucs.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)
mysql-test/t/ps.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)

mysql-test/r/ctype_ucs.result

@@ -684,3 +684,22 @@ select f1 from t1 where f1 like 'a%';
 f1
 a
 drop table t1;
+create table t1 (utext varchar(20) character set ucs2);
+insert into t1 values ("lily");
+insert into t1 values ("river");
+prepare stmt from 'select utext from t1 where utext like ?';
+set @param1='%%';
+execute stmt using @param1;
+utext
+lily
+river
+execute stmt using @param1;
+utext
+lily
+river
+select utext from t1 where utext like '%%';
+utext
+lily
+river
+drop table t1;
+deallocate prepare stmt;

mysql-test/r/ps.result

@@ -639,25 +639,6 @@ execute stmt using @a, @b;
 ?=?
 1
 deallocate prepare stmt;
-create table t1 (utext varchar(20) character set ucs2);
-insert into t1 values ("lily");
-insert into t1 values ("river");
-prepare stmt from 'select utext from t1 where utext like ?';
-set @param1='%%';
-execute stmt using @param1;
-utext
-lily
-river
-execute stmt using @param1;
-utext
-lily
-river
-select utext from t1 where utext like '%%';
-utext
-lily
-river
-drop table t1;
-deallocate prepare stmt;
 create table t1 (a int);
 prepare stmt from "select ??";
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '?' at line 1

mysql-test/t/ctype_ucs.test

@@ -427,4 +427,18 @@ insert into t1 values('a');
 create index t1f1 on t1(f1);
 select f1 from t1 where f1 like 'a%';
 drop table t1;
+
+#
+# Bug#9442 Set parameter make query fail if column character set is UCS2
+#
+create table t1 (utext varchar(20) character set ucs2);
+insert into t1 values ("lily");
+insert into t1 values ("river");
+prepare stmt from 'select utext from t1 where utext like ?';
+set @param1='%%';
+execute stmt using @param1;
+execute stmt using @param1;
+select utext from t1 where utext like '%%';
+drop table t1;
+deallocate prepare stmt;
 # End of 4.1 tests

mysql-test/t/ps.test

@@ -665,19 +665,6 @@ set @b='CHRISTINE';
 execute stmt using @a, @b;
 deallocate prepare stmt;
 #
-# Bug#9442 Set parameter make query fail if column character set is UCS2
-#
-create table t1 (utext varchar(20) character set ucs2);
-insert into t1 values ("lily");
-insert into t1 values ("river");
-prepare stmt from 'select utext from t1 where utext like ?';
-set @param1='%%';
-execute stmt using @param1;
-execute stmt using @param1;
-select utext from t1 where utext like '%%';
-drop table t1;
-deallocate prepare stmt;
-#
 # Bug#11299 "prepared statement makes wrong SQL syntax in binlog which stops
 # replication": check that errouneous queries with placeholders are not
 # allowed