bk commit into 5.1 tree (gkodinov:1.2366)

[gkodinov]

Below is the list of changes that have just been committed into a local
5.1 repository of gkodinov. When gkodinov 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-30 12:29:11+01:00, gkodinov@stripped +5 -0
  Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
  into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
  MERGE: 1.1810.1698.193

  mysql-test/r/func_gconcat.result@stripped, 2006-11-30 12:29:05+01:00,
gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.52.1.13

  mysql-test/r/ps.result@stripped, 2006-11-30 12:29:05+01:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.56.1.27

  mysql-test/t/func_gconcat.test@stripped, 2006-11-30 12:29:05+01:00,
gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.44.1.8

  mysql-test/t/ps.test@stripped, 2006-11-30 12:29:06+01:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.56.1.24

  sql/item_sum.cc@stripped, 2006-11-30 12:29:06+01:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.170.1.21

# 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:	gkodinov
# Host:	dl145s.mysql.com
# Root:	/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt/RESYNC

--- 1.65/mysql-test/r/func_gconcat.result	2006-11-29 11:46:25 +01:00
+++ 1.66/mysql-test/r/func_gconcat.result	2006-11-30 12:29:05 +01:00
@@ -64,25 +64,6 @@ grp	group_concat(a order by a,d+c-ascii(
 1	1
 2	2,3
 3	4,5,6,7,8,9
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'a         '
-Warning	1292	Truncated incorrect DOUBLE value: 'a         '
-Warning	1292	Truncated incorrect DOUBLE value: 'a         '
-Warning	1292	Truncated incorrect DOUBLE value: 'b         '
-Warning	1292	Truncated incorrect DOUBLE value: 'b         '
-Warning	1292	Truncated incorrect DOUBLE value: 'c         '
-Warning	1292	Truncated incorrect DOUBLE value: 'a         '
-Warning	1292	Truncated incorrect DOUBLE value: 'E         '
-Warning	1292	Truncated incorrect DOUBLE value: 'b         '
-Warning	1292	Truncated incorrect DOUBLE value: 'C         '
-Warning	1292	Truncated incorrect DOUBLE value: 'b         '
-Warning	1292	Truncated incorrect DOUBLE value: 'D         '
-Warning	1292	Truncated incorrect DOUBLE value: 'd         '
-Warning	1292	Truncated incorrect DOUBLE value: 'd         '
-Warning	1292	Truncated incorrect DOUBLE value: 'd         '
-Warning	1292	Truncated incorrect DOUBLE value: 'd         '
-Warning	1292	Truncated incorrect DOUBLE value: 'c         '
-Warning	1292	Truncated incorrect DOUBLE value: 'D         '
 select grp,group_concat(a order by d+c-ascii(c),a) from t1 group by grp;
 grp	group_concat(a order by d+c-ascii(c),a)
 1	1

--- 1.54/mysql-test/t/func_gconcat.test	2006-11-13 17:58:25 +01:00
+++ 1.55/mysql-test/t/func_gconcat.test	2006-11-30 12:29:05 +01:00
@@ -29,7 +29,9 @@ select grp,group_concat(c order by c) fr
 select grp,group_concat(c order by c desc) from t1 group by grp;
 select grp,group_concat(d order by a) from t1 group by grp;
 select grp,group_concat(d order by a desc) from t1 group by grp;
+--disable_warnings
 select grp,group_concat(a order by a,d+c-ascii(c)-a) from t1 group by grp;
+--enable_warnings
 select grp,group_concat(a order by d+c-ascii(c),a) from t1 group by grp;
 select grp,group_concat(c order by 1) from t1 group by grp;
 select grp,group_concat(distinct c order by c) from t1 group by grp;