bk commit into 4.1 tree (bar:1.2367) BUG#12351

[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.2367 05/08/08 19:09:54 bar@stripped +3 -0
  func_system.result, func_system.test:
    adding test case
  item_strfunc.cc:
    Bug#12351
    CONCAT with USER()/DATEBASE() and
    a column gets strange results.
    Mark created Item_str as constant, so CONCAT
    cannot reuse it for optimization purposes.

  mysql-test/r/func_system.result
    1.21 05/08/08 19:08:57 bar@stripped +15 -0
    adding test case

  mysql-test/t/func_system.test
    1.14 05/08/08 19:08:52 bar@stripped +12 -0
    adding test case

  sql/item_strfunc.cc
    1.234 05/08/08 19:07:46 bar@stripped +1 -0
    Bug#12351
    CONCAT with USER()/DATEBASE() and
    a column gets strange results

# 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.233/sql/item_strfunc.cc	2005-07-22 23:46:25 +05:00
+++ 1.234/sql/item_strfunc.cc	2005-08-08 19:07:46 +05:00
@@ -1550,6 +1550,7 @@
     return NULL;
   }
   conv->str_value.copy();
+  conv->str_value.shrink_to_length();
   return conv;
 }
 

--- 1.20/mysql-test/r/func_system.result	2005-03-28 12:24:00 +05:00
+++ 1.21/mysql-test/r/func_system.result	2005-08-08 19:08:57 +05:00
@@ -68,6 +68,21 @@
 select TRUE,FALSE,NULL;
 TRUE	FALSE	NULL
 1	0	NULL
+create table t1 (c1 char(5)) character set=latin1;
+insert into t1 values('row 1');
+insert into t1 values('row 2');
+insert into t1 values('row 3');
+select concat(user(), '--', c1) from t1;
+concat(user(), '--', c1)
+root@localhost--row 1
+root@localhost--row 2
+root@localhost--row 3
+select concat(database(), '--', c1) from t1;
+concat(database(), '--', c1)
+test--row 1
+test--row 2
+test--row 3
+drop table t1;
 create table t1 (a char(10)) character set latin1;
 select * from t1 where a=version();
 a

--- 1.13/mysql-test/t/func_system.test	2005-07-28 05:21:42 +05:00
+++ 1.14/mysql-test/t/func_system.test	2005-08-08 19:08:52 +05:00
@@ -32,6 +32,18 @@
 select TRUE,FALSE,NULL;
 
 #
+# Bug#12351: CONCAT with USER()/DATEBASE() and
+# a constant and a column gets strange results
+#
+create table t1 (c1 char(5)) character set=latin1;
+insert into t1 values('row 1');
+insert into t1 values('row 2');
+insert into t1 values('row 3');
+select concat(user(), '--', c1) from t1;
+select concat(database(), '--', c1) from t1;
+drop table t1;
+
+#
 # Bug#8291 Illegal collation mix with USER() function
 #
 create table t1 (a char(10)) character set latin1;