bk commit into 4.1 tree (bar:1.2148)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar 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
  1.2148 05/03/28 12:24:12 bar@stripped +4 -0
  func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result:
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/t/func_system.test
    1.12 05/03/28 12:24:00 bar@stripped +2 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/t/ctype_utf8.test
    1.51 05/03/28 12:24:00 bar@stripped +11 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/r/func_system.result
    1.20 05/03/28 12:24:00 bar@stripped +4 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

  mysql-test/r/ctype_utf8.result
    1.51 05/03/28 12:24:00 bar@stripped +14 -0
    Prove that the queries mentioned in
    Bugs#5980: NULL requires a characterset in a union
    works fine after recent changes related to itroducing
    more coercibility level: IRNORABLE and SYSCONST.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.50/mysql-test/r/ctype_utf8.result	2005-03-15 17:15:43 +04:00
+++ 1.51/mysql-test/r/ctype_utf8.result	2005-03-28 12:24:00 +05:00
@@ -871,3 +871,17 @@
 select convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8);
 convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8)
 1
+set names latin1;
+create table t1 (a varchar(10)) character set utf8;
+insert into t1 values ('test');
+select ifnull(a,'') from t1;
+ifnull(a,'')
+test
+drop table t1;
+select repeat(_utf8'+',3) as h union select NULL;
+h
++++
+NULL
+select ifnull(NULL, _utf8'string');
+ifnull(NULL, _utf8'string')
+string

--- 1.50/mysql-test/t/ctype_utf8.test	2005-03-15 17:15:43 +04:00
+++ 1.51/mysql-test/t/ctype_utf8.test	2005-03-28 12:24:00 +05:00
@@ -707,3 +707,14 @@
 # Bug#8385: utf8_general_ci treats Cyrillic letters I and SHORT I as the same
 #
 select convert(_koi8r'É' using utf8) < convert(_koi8r'Ê' using utf8);
+
+#
+# Bugs#5980: NULL requires a characterset in a union
+#
+set names latin1;
+create table t1 (a varchar(10)) character set utf8;
+insert into t1 values ('test');
+select ifnull(a,'') from t1;
+drop table t1;
+select repeat(_utf8'+',3) as h union select NULL;
+select ifnull(NULL, _utf8'string');

--- 1.19/mysql-test/r/func_system.result	2005-03-04 14:20:09 +04:00
+++ 1.20/mysql-test/r/func_system.result	2005-03-28 12:24:00 +05:00
@@ -75,4 +75,8 @@
 a
 select * from t1 where a=user();
 a
+insert into t1 values ('a');
+select left(concat(a,version()),1) from t1;
+left(concat(a,version()),1)
+a
 drop table t1;

--- 1.11/mysql-test/t/func_system.test	2005-03-04 14:19:11 +04:00
+++ 1.12/mysql-test/t/func_system.test	2005-03-28 12:24:00 +05:00
@@ -38,4 +38,6 @@
 select * from t1 where a=version();
 select * from t1 where a=database();
 select * from t1 where a=user();
+insert into t1 values ('a');
+select left(concat(a,version()),1) from t1;
 drop table t1;