Post-merge fix (reorder tests in ctype_ucs.test)

mysql-test/t/ctype_ucs.test

@@ -547,14 +547,6 @@ select quote(name) from bug20536;
 
 drop table bug20536;
 
-#
-# BUG#31159 - fulltext search on ucs2 column crashes server
-#
-CREATE TABLE t1(a TEXT CHARSET ucs2 COLLATE ucs2_unicode_ci);
-INSERT INTO t1 VALUES('abcd');
-SELECT * FROM t1 WHERE MATCH(a) AGAINST ('+abcd' IN BOOLEAN MODE);
-DROP TABLE t1;
-
 #
 # Bug #31615: crash after set names ucs2 collate xxx
 #
@@ -567,6 +559,14 @@ set character_set_client= ucs2;
 --error 1231
 set character_set_client= concat('ucs', substr('2', 1));
 
+#
+# BUG#31159 - fulltext search on ucs2 column crashes server
+#
+CREATE TABLE t1(a TEXT CHARSET ucs2 COLLATE ucs2_unicode_ci);
+INSERT INTO t1 VALUES('abcd');
+SELECT * FROM t1 WHERE MATCH(a) AGAINST ('+abcd' IN BOOLEAN MODE);
+DROP TABLE t1;
+
 --echo End of 4.1 tests
 
 #