summaryrefslogtreecommitdiff
path: root/sql/share/errmsg.txt
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-11-10 16:26:39 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-11-10 16:26:39 -0200
commit4297dcaac875b835a1680200b1d2220154aca49d (patch)
treec07634e32a628020fc0ff34208a11977d21d54a7 /sql/share/errmsg.txt
parentc34c66650deabf97764e8aba55c168e41ab69647 (diff)
downloadmariadb-git-4297dcaac875b835a1680200b1d2220154aca49d.tar.gz
Backport of Bug#36785 to mysql-next-mr
------------------------------------------------------------ revno: 2630.2.13 revision-id: davi@mysql.com-20080612190452-cx6h7rm557bcq7sa parent: davi@mysql.com-20080611124915-csejwrxfdga9upho committer: Davi Arnaut <davi@mysql.com> branch nick: 36785-6.0 timestamp: Thu 2008-06-12 16:04:52 -0300 message: Bug#36785: Wrong error message when group_concat() exceeds max length The problem is that when ER_CUT_VALUE_GROUP_CONCAT is elevated to a error, the message does not get updated with the number of cut lines when group_concat() exceeds max length. The solution is to modify the warning message to be more meaningful by giving the number of the line that was cut and to issue the warning for each line that is cut. This approach is inline with how other per-row truncated data warnings are issued avoids violating the warning internal interface. mysql-test/suite/sys_vars/r/group_concat_max_len_func.result: Update result to reflect the new warning message sql/share/errmsg.txt: Update warning message ER_CUT_VALUE_GROUP_CONCAT.
Diffstat (limited to 'sql/share/errmsg.txt')
-rw-r--r--sql/share/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 317087854c1..cdda89413f1 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -4880,6 +4880,7 @@ ER_ZLIB_Z_DATA_ERROR
spa "ZLIB: Dato de entrada fué corrompido para zlib"
ER_CUT_VALUE_GROUP_CONCAT
eng "Row %u was cut by GROUP_CONCAT()"
+ por "Linha %u foi cortada por GROUP_CONCAT()"
ER_WARN_TOO_FEW_RECORDS 01000
eng "Row %ld doesn't contain data for all columns"
ger "Zeile %ld enthält nicht für alle Felder Daten"