Fix after manual merge.

mysql-test/r/func_str.result

@@ -1148,20 +1148,6 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 Warnings:
 Note	1003	select `test`.`t1`.`code` AS `code`,`test`.`t2`.`id` AS `id` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`code` = _latin1'a12') and (length(`test`.`t1`.`code`) = 5))
 DROP TABLE t1,t2;
-SET @orig_sql_mode = @@SQL_MODE;
-SET SQL_MODE=traditional;
-SELECT CHAR(0xff,0x8f USING utf8);
-CHAR(0xff,0x8f USING utf8)
-NULL
-Warnings:
-Error	1300	Invalid utf8 character string: 'FF8F'
-SELECT CHAR(0xff,0x8f USING utf8) IS NULL;
-CHAR(0xff,0x8f USING utf8) IS NULL
-1
-Warnings:
-Error	1300	Invalid utf8 character string: 'FF8F'
-SET SQL_MODE=@orig_sql_mode;
-End of 5.0 tests
 select locate('he','hello',-2);
 locate('he','hello',-2)
 0
@@ -1917,4 +1903,17 @@ Warnings:
 Error	1292	Truncated incorrect DECIMAL value: ''
 Error	1292	Truncated incorrect DECIMAL value: ''
 Warning	1301	Result of lpad() was larger than max_allowed_packet (1048576) - truncated
-End of 5.1 tests
+SET @orig_sql_mode = @@SQL_MODE;
+SET SQL_MODE=traditional;
+SELECT CHAR(0xff,0x8f USING utf8);
+CHAR(0xff,0x8f USING utf8)
+NULL
+Warnings:
+Error	1300	Invalid utf8 character string: 'FF8F'
+SELECT CHAR(0xff,0x8f USING utf8) IS NULL;
+CHAR(0xff,0x8f USING utf8) IS NULL
+1
+Warnings:
+Error	1300	Invalid utf8 character string: 'FF8F'
+SET SQL_MODE=@orig_sql_mode;
+End of 5.0 tests

mysql-test/t/func_str.test

@@ -781,22 +781,6 @@ SELECT * FROM t1 INNER JOIN t2 ON code=id
 DROP TABLE t1,t2;
 
 
-#
-# BUG#17047: CHAR() and IN() can return NULL without signaling NULL
-# result
-#
-SET @orig_sql_mode = @@SQL_MODE;
-SET SQL_MODE=traditional;
-
-SELECT CHAR(0xff,0x8f USING utf8);
-SELECT CHAR(0xff,0x8f USING utf8) IS NULL;
-
-SET SQL_MODE=@orig_sql_mode;
-
-
---echo End of 5.0 tests
-
-
 #
 # Bug #10963
 # 4294967296 18446744073709551616
@@ -987,4 +971,17 @@ select lpad('hello', -18446744073709551617, '1');
 select lpad('hello', 18446744073709551617, '1');
 
 
---echo End of 5.1 tests
+#
+# BUG#17047: CHAR() and IN() can return NULL without signaling NULL
+# result
+#
+SET @orig_sql_mode = @@SQL_MODE;
+SET SQL_MODE=traditional;
+
+SELECT CHAR(0xff,0x8f USING utf8);
+SELECT CHAR(0xff,0x8f USING utf8) IS NULL;
+
+SET SQL_MODE=@orig_sql_mode;
+
+
+--echo End of 5.0 tests