bk commit into 5.0 tree (ramil:1.2301)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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-10-13 19:09:22+05:00, ramil@stripped +3 -0
  Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
  into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
  MERGE: 1.1616.2144.235

  mysql-test/r/func_compress.result@stripped, 2006-10-13 19:09:15+05:00, ramil@stripped +0 -0
    SCCS merged
    MERGE: 1.16.1.1

  mysql-test/t/func_compress.test@stripped, 2006-10-13 19:09:15+05:00, ramil@stripped +0 -0
    SCCS merged
    MERGE: 1.10.1.3

  sql/item_strfunc.cc@stripped, 2006-10-13 19:07:18+05:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.196.6.19

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/bug23254/my50-bug23254/RESYNC

--- 1.286/sql/item_strfunc.cc	2006-10-13 19:09:38 +05:00
+++ 1.287/sql/item_strfunc.cc	2006-10-13 19:09:38 +05:00
@@ -2965,6 +2965,7 @@ String *Item_func_compress::val_str(Stri
     null_value= 1;
     return 0;
   }
+  null_value= 0;
   if (res->is_empty()) return res;
 
   /*

--- 1.19/mysql-test/r/func_compress.result	2006-10-13 19:09:38 +05:00
+++ 1.20/mysql-test/r/func_compress.result	2006-10-13 19:09:38 +05:00
@@ -79,6 +79,16 @@ uncompress(a)	uncompressed_length(a)
 NULL	NULL
 a	1
 drop table t1;
+create table t1(a blob);
+insert into t1 values ('0'), (NULL), ('0');
+select compress(a), compress(a) from t1;
+select compress(a) is null from t1;
+compress(a) is null
+0
+1
+0
+drop table t1;
+End of 4.1 tests
 create table t1 (a varchar(32) not null);
 insert into t1 values ('foo');
 explain select * from t1 where uncompress(a) is null;

--- 1.14/mysql-test/t/func_compress.test	2006-10-13 19:09:38 +05:00
+++ 1.15/mysql-test/t/func_compress.test	2006-10-13 19:09:38 +05:00
@@ -56,7 +56,19 @@ insert into t1 values(NULL), (compress('
 select uncompress(a), uncompressed_length(a) from t1;
 drop table t1;
 
-# End of 4.1 tests
+#
+# Bug #23254: problem with compress(NULL)
+#
+
+create table t1(a blob);
+insert into t1 values ('0'), (NULL), ('0');
+--disable_result_log
+select compress(a), compress(a) from t1;
+--enable_result_log
+select compress(a) is null from t1;
+drop table t1;
+
+--echo End of 4.1 tests
 
 #
 # Bug #18539: uncompress(d) is null: impossible?