mariadb/sql
Davi Arnaut 4297dcaac8 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.
2009-11-10 16:26:39 -02:00
..
examples Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-06-17 15:54:01 +02:00
share Backport of Bug#36785 to mysql-next-mr 2009-11-10 16:26:39 -02:00
.cvsignore
add_errmsg WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
authors.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
client_settings.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
CMakeLists.txt manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
contributors.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
custom_conf.h
debug_sync.cc Fixed a valgrind error in debug_sync 2009-10-04 12:53:02 +03:00
debug_sync.h WL#4259 - Debug Sync Facility 2009-09-29 17:38:40 +02:00
derror.cc WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
des_key_file.cc
discover.cc
event_data_objects.cc A backport of a patch for Bug#35297. 2009-10-08 00:57:03 +04:00
event_data_objects.h
event_db_repository.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-09-23 15:21:29 +02:00
event_db_repository.h
event_parse_data.cc Bug#29125 Windows Server X64: so many compiler warnings 2009-02-13 11:41:47 -05:00
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc Backport of the following revision from 6.0-codebase: 2009-10-13 22:29:28 +04:00
event_scheduler.h
events.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
events.h
field.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
field.h Backport a patch from 6.0: 2009-11-02 17:17:14 +03:00
field_conv.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-06-17 15:54:01 +02:00
filesort.cc Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01.13 2009) 2009-02-17 13:24:09 +01:00
frm_crypt.cc
gen_lex_hash.cc Bug#29125 Windows Server X64: so many compiler warnings 2009-02-13 11:41:47 -05:00
gstream.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-06-09 18:11:21 +02:00
gstream.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_ndbcluster.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
ha_ndbcluster.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
ha_ndbcluster_binlog.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
ha_ndbcluster_binlog.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_ndbcluster_tables.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_partition.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
ha_partition.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
handler.cc Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
handler.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
hash_filo.cc
hash_filo.h Backport of: 2009-10-14 20:37:38 +04:00
hostname.cc Backport of: 2009-10-14 20:37:38 +04:00
init.cc
item.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
item.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
item_buff.cc
item_cmpfunc.cc Bug#42664: Sign ignored for TIME types when not comparing as longlong 2009-11-04 11:28:50 +01:00
item_cmpfunc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
item_create.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
item_create.h
item_func.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
item_func.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
item_geofunc.cc Bug#44684: valgrind reports invalid reads in 2009-06-17 16:58:33 +02:00
item_geofunc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
item_row.cc
item_row.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
item_strfunc.cc WL#4584 Internationalized number format 2009-10-05 20:06:04 +05:00
item_strfunc.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
item_subselect.cc Backport of: 2009-10-16 19:58:26 +04:00
item_subselect.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
item_sum.cc Bug#48060 Memory leak - Item::val_bool() (item.cc:184) from optimizer_subquery grammar 2009-10-28 11:07:30 +01:00
item_sum.h Bug#48060 Memory leak - Item::val_bool() (item.cc:184) from optimizer_subquery grammar 2009-10-28 11:07:30 +01:00
item_timefunc.cc Bug#42661: sec_to_time() and signedness 2009-11-04 09:53:38 +01:00
item_timefunc.h Automerge from mysql-next-mr. 2009-10-27 12:59:09 +03:00
item_xmlfunc.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-09-23 15:21:29 +02:00
item_xmlfunc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
key.cc WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
lex.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
lex_symbol.h
lock.cc Backport of: 2009-10-14 20:37:38 +04:00
log.cc Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
log.h BUG#40611, BUG#44779: reverted in mysql-5.1-rep+2. 2009-10-07 22:13:07 +01:00
log_event.cc manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
log_event.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
log_event_old.cc manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
log_event_old.h
Makefile.am Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
message.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
message.mc
message.rc
mf_iocache.cc
MSG00001.bin
my_decimal.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
my_decimal.h Bug#45261: Crash, stored procedure + decimal 2009-08-24 16:47:08 -03:00
my_lock.c
mysql_priv.h Bug#27145 EXTRA_ACL troubles 2009-11-10 15:56:05 +01:00
mysql_priv.h.pp Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash 2009-10-06 13:04:51 +02:00
mysqld.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
mysqld_suffix.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
net_serv.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
nt_servc.cc
nt_servc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
opt_range.cc Merge from mysql-trunk-merge. 2009-10-19 17:36:19 +04:00
opt_range.h Ported WL#3220 to mysql-next-mr. 2009-09-28 10:21:25 +03:00
opt_sum.cc Bug#48060 Memory leak - Item::val_bool() (item.cc:184) from optimizer_subquery grammar 2009-10-28 11:07:30 +01:00
parse_file.cc Bug#44834 strxnmov is expected to behave as you'd expect 2009-06-19 13:24:43 +05:00
parse_file.h Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon) 2009-04-13 18:09:10 +05:00
partition_element.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
partition_info.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-09-23 15:21:29 +02:00
partition_info.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
password.c Manual merge. 2009-06-01 16:00:38 +04:00
procedure.cc
procedure.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
protocol.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
protocol.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
records.cc Backport of: 2009-10-16 19:58:26 +04:00
records.h Backport of: 2009-10-16 19:58:26 +04:00
repl_failsafe.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
repl_failsafe.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
replication.h Backporting WL#4398 WL#1720 2009-09-26 12:49:49 +08:00
rpl_constants.h
rpl_filter.cc Backport of: 2009-10-14 20:37:38 +04:00
rpl_filter.h
rpl_handler.cc Fix automerge: s/hash_search/my_hash_search/. 2009-10-28 11:42:18 +03:00
rpl_handler.h Backporting WL#4398 WL#1720 2009-09-26 12:49:49 +08:00
rpl_injector.cc
rpl_injector.h Backport of: 2009-10-14 15:14:58 +04:00
rpl_mi.cc merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixes 2009-10-01 20:22:44 +03:00
rpl_mi.h merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixes 2009-10-01 20:22:44 +03:00
rpl_record.cc BUG#43789 different master/slave table defs cause crash: text/varchar null 2009-09-29 15:18:44 +01:00
rpl_record.h BUG#43789 different master/slave table defs cause crash: text/varchar null 2009-09-29 15:18:44 +01:00
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind 2009-06-16 16:04:30 +01:00
rpl_reporting.h BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind 2009-06-16 16:04:30 +01:00
rpl_rli.cc manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
rpl_rli.h backporting fixes of bug@45940 to 5.1-rpl+2 to cover failures rpl_heartbeat_* as well. 2009-10-09 16:26:37 +03:00
rpl_tblmap.cc Backport of: 2009-10-14 20:37:38 +04:00
rpl_tblmap.h Backport of: 2009-10-14 20:37:38 +04:00
rpl_utility.cc
rpl_utility.h Bug#42977 RBR logs for rows with more than 250 column results in corrupt binlog 2009-03-25 12:53:56 +02:00
scheduler.cc
scheduler.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
set_var.cc Bug#38551 query cache can still consume [very little] cpu time even when it is off. 2009-10-29 12:19:36 +01:00
set_var.h Bug#38551 query cache can still consume [very little] cpu time even when it is off. 2009-10-29 12:19:36 +01:00
slave.cc Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
slave.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
sp.cc Backport of Bug#32140 to mysql-next-mr 2009-11-10 16:14:53 -02:00
sp.h BUG#41166 stored function requires "deterministic" if binlog_format is "statement" 2009-07-28 18:44:38 +01:00
sp_cache.cc Backport of: 2009-10-14 20:37:38 +04:00
sp_cache.h
sp_head.cc Backport of Bug#36649 to mysql-next-mr 2009-11-10 16:11:27 -02:00
sp_head.h merging 2009-04-29 07:59:10 +05:00
sp_pcontext.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sp_pcontext.h WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sp_rcontext.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sp_rcontext.h WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
spatial.cc Merge from 5.0 for 43414 2009-08-28 18:21:54 +02:00
spatial.h Merge from 5.0-bugteam 2009-06-17 16:56:44 +02:00
sql_acl.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_acl.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
sql_analyse.cc Merge from 5.0-bugteam 2009-06-17 16:56:44 +02:00
sql_analyse.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_array.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_base.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_binlog.cc manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Bug#38551 query cache can still consume [very little] cpu time even when it is off. 2009-10-29 12:19:36 +01:00
sql_cache.h Bug#38551 query cache can still consume [very little] cpu time even when it is off. 2009-10-29 12:19:36 +01:00
sql_class.cc Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
sql_class.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
sql_client.cc
sql_connect.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_crypt.cc Bug#44358 valgrind errors with decode() function 2009-04-23 12:43:42 +05:00
sql_crypt.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_cursor.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_cursor.h
sql_db.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
sql_delete.cc Manual merge from mysql-trunk-merge. 2009-10-14 12:25:39 +04:00
sql_derived.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sql_do.cc
sql_error.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
sql_error.h WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
sql_handler.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_help.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_insert.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_lex.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_lex.h Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_list.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_list.h Fix build failure on Linux. 2009-10-22 23:31:06 +04:00
sql_load.cc Merging mysql-next-mr-merge to mysql-next-mr. 2009-10-21 15:48:22 +05:00
sql_locale.cc Bug#46633 Obsolete Serbian locale name 2009-10-19 12:52:29 +05:00
sql_manager.cc
sql_map.cc
sql_map.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_olap.cc
sql_parse.cc Backport of Bug#36649 to mysql-next-mr 2009-11-10 16:11:27 -02:00
sql_partition.cc manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
sql_partition.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_plugin.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_plugin.h Backporting WL#4398 WL#1720 2009-09-26 12:49:49 +08:00
sql_prepare.cc Bug#5299 Remove SHOW COLUMN TYPES, backport to Betony 2009-10-23 11:20:44 +05:00
sql_prepare.h Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_profile.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_profile.h Bug #44651 "have_community_features" variable should be renamed 2009-10-09 15:59:25 +02:00
sql_rename.cc Bug#44834 strxnmov is expected to behave as you'd expect 2009-06-19 13:24:43 +05:00
sql_repl.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_repl.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_select.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_select.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
sql_servers.cc Backport of: 2009-10-14 20:37:38 +04:00
sql_servers.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_show.cc Backport of Bug#41971 to mysql-next-mr 2009-11-10 12:21:50 -02:00
sql_show.h
sql_signal.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sql_signal.h WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sql_sort.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_state.c
sql_string.cc Backporting WL#3759 Optimize identifier conversion in client-server protocol 2009-09-30 10:09:28 +05:00
sql_string.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
sql_table.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
sql_tablespace.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sql_test.cc Backport of: 2009-10-14 20:37:38 +04:00
sql_trigger.cc Bug#27145 EXTRA_ACL troubles 2009-10-19 14:58:13 +02:00
sql_trigger.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_udf.cc Backport of: 2009-10-14 20:37:38 +04:00
sql_udf.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_union.cc 5.0-bugteam->5.1-bugteam merge 2009-05-15 12:11:07 +05:00
sql_update.cc Merge with next-mr-runtime. 2009-10-22 12:46:07 +04:00
sql_view.cc Bug#27145 EXTRA_ACL troubles 2009-10-19 14:58:13 +02:00
sql_view.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_yacc.yy Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
strfunc.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-09-23 15:21:29 +02:00
structs.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
table.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
table.h Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
thr_malloc.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
time.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
tzfile.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
tztime.cc Backport of: 2009-10-14 20:37:38 +04:00
tztime.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
udf_example.c Manual merge from mysql-trunk-merge. 2009-10-14 12:25:39 +04:00
udf_example.def
uniques.cc Merge from 5.0-bugteam 2009-06-17 16:56:44 +02:00
unireg.cc Backporting WL#4164 Two-byte collation IDs 2009-10-15 15:17:32 +05:00
unireg.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00