bk commit into 4.1 tree (gluh:1.2101) BUG#8785

[gluh]

Below is the list of changes that have just been committed into a local
4.1 repository of gluh. When gluh 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.2101 05/03/10 15:55:14 gluh@stripped +3 -0
  Fix for bug #8785: INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT strange content

  sql/item_strfunc.cc
    1.219 05/03/10 15:54:03 gluh@stripped +1 -1
    Fix for bug #8785: INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT strange content

  mysql-test/t/func_str.test
    1.69 05/03/10 15:54:03 gluh@stripped +10 -0
    Fix for bug #8785: INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT strange content

  mysql-test/r/func_str.result
    1.87 05/03/10 15:54:03 gluh@stripped +9 -0
    Fix for bug #8785: INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT strange content

# 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:	gluh
# Host:	gluh.mysql.r18.ru
# Root:	/home/gluh/MySQL-BUGS/mysql-4.1.8785

--- 1.218/sql/item_strfunc.cc	Tue Mar  8 16:17:54 2005
+++ 1.219/sql/item_strfunc.cc	Thu Mar 10 15:54:03 2005
@@ -265,7 +265,7 @@
     {
       if (!(res2=args[i]->val_str(use_as_buff)))
 	goto null;
-      if (res2->length() == 0)
+      if (res2->length() == 0 && !args[0]->const_item())
 	continue;
       if (res->length()+res2->length() >
 	  current_thd->variables.max_allowed_packet)

--- 1.86/mysql-test/r/func_str.result	Fri Mar  4 13:19:59 2005
+++ 1.87/mysql-test/r/func_str.result	Thu Mar 10 15:54:03 2005
@@ -739,3 +739,12 @@
 SELECT CHAR_LENGTH(CHAR(NULL,121,83,81,'76')) as my_column;
 my_column
 4
+set @@session.sql_mode=pipes_as_concat;
+create table t1 (f1 varchar(1) not null) default charset utf8;
+insert into t1 values (''), ('');
+select '->' || f1 || '<-'  from t1;
+'->' || f1 || '<-'
+-><-
+-><-
+drop table t1;
+set @@session.sql_mode=default;

--- 1.68/mysql-test/t/func_str.test	Wed Feb 23 18:14:45 2005
+++ 1.69/mysql-test/t/func_str.test	Thu Mar 10 15:54:03 2005
@@ -482,3 +482,13 @@
 #
 SELECT CHAR(NULL,121,83,81,'76') as my_column;
 SELECT CHAR_LENGTH(CHAR(NULL,121,83,81,'76')) as my_column;
+
+#
+# Bug #8785: INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT strange content
+#
+set @@session.sql_mode=pipes_as_concat;
+create table t1 (f1 varchar(1) not null) default charset utf8;
+insert into t1 values (''), ('');
+select '->' || f1 || '<-'  from t1;
+drop table t1;
+set @@session.sql_mode=default;