From 7464a20bc8abac5d3f3b99b7bfd2209a2c79448f Mon Sep 17 00:00:00 2001
From: "gkodinov/kgeorge@macbook.gmz" <>
Date: Thu, 30 Nov 2006 12:58:05 +0200
Subject: [PATCH] func_gconcat.result, func_gconcat.test:   disabled warnings
 because their order is undeterministic

---
 mysql-test/r/func_gconcat.result | 19 -------------------
 mysql-test/t/func_gconcat.test   |  2 ++
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result
index 53bcbfafdd5..655cdc4131c 100644
--- a/mysql-test/r/func_gconcat.result
+++ b/mysql-test/r/func_gconcat.result
@@ -64,25 +64,6 @@ grp	group_concat(a order by a,d+c-ascii(c)-a)
 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
diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test
index 610c93dfb0f..bdc267d56db 100644
--- a/mysql-test/t/func_gconcat.test
+++ b/mysql-test/t/func_gconcat.test
@@ -29,7 +29,9 @@ select grp,group_concat(c order by c) from t1 group by grp;
 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;