bk commit into 5.1 tree (kroki:1.2363)

[kroki]

Below is the list of changes that have just been committed into a local
5.1 repository of tomash. When tomash 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, 2006-11-16 14:49:41+03:00, kroki@stripped +2 -0
  Fix after manual merge.

  mysql-test/r/func_str.result@stripped, 2006-11-16 14:49:35+03:00, kroki@stripped
+14 -15
    Fix after manual merge.

  mysql-test/t/func_str.test@stripped, 2006-11-16 14:49:36+03:00, kroki@stripped +14
-17
    Fix after manual merge.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.1-bug17047

--- 1.129/mysql-test/r/func_str.result	2006-11-16 14:49:56 +03:00
+++ 1.130/mysql-test/r/func_str.result	2006-11-16 14:49:56 +03:00
@@ -1148,20 +1148,6 @@ id	select_type	table	type	possible_keys	
 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

--- 1.96/mysql-test/t/func_str.test	2006-11-16 14:49:56 +03:00
+++ 1.97/mysql-test/t/func_str.test	2006-11-16 14:49:56 +03:00
@@ -782,22 +782,6 @@ 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', -184467440737095516
 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