diff options
| author | unknown <hf@deer.(none)> | 2004-06-29 19:55:13 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-06-29 19:55:13 +0500 |
| commit | 58bdba5785313f89398231f796ba989a4de81a69 (patch) | |
| tree | 59be5629c3d654d6e28ff306d4e15ffad39fb346 /sql/item_geofunc.cc | |
| parent | 0a1381e05b09aa4d99cd4cbd1e0a0985a02c175a (diff) | |
| download | mariadb-git-58bdba5785313f89398231f796ba989a4de81a69.tar.gz | |
WL#1600 (Warn if result is truncatet due to max_allowed_packet)
include/mysqld_error.h:
Warning added
mysql-test/r/func_str.result:
test result fixed
mysql-test/r/packet.result:
test resut fixed
sql/item_geofunc.cc:
warning issued
sql/item_strfunc.cc:
warning issued
sql/share/czech/errmsg.txt:
Warning added
sql/share/danish/errmsg.txt:
Warning added
sql/share/dutch/errmsg.txt:
Warning added
sql/share/english/errmsg.txt:
Warning added
sql/share/estonian/errmsg.txt:
Warning added
sql/share/french/errmsg.txt:
Warning added
sql/share/german/errmsg.txt:
Warning added
sql/share/greek/errmsg.txt:
Warning added
sql/share/hungarian/errmsg.txt:
Warning added
sql/share/italian/errmsg.txt:
Warning added
sql/share/japanese/errmsg.txt:
Warning added
sql/share/korean/errmsg.txt:
Warning added
sql/share/norwegian-ny/errmsg.txt:
Warning added
sql/share/norwegian/errmsg.txt:
Warning added
sql/share/polish/errmsg.txt:
Warning added
sql/share/portuguese/errmsg.txt:
Warning added
sql/share/romanian/errmsg.txt:
Warning added
sql/share/russian/errmsg.txt:
Warning added
sql/share/serbian/errmsg.txt:
Warning added
sql/share/slovak/errmsg.txt:
Warning added
sql/share/spanish/errmsg.txt:
Warning added
sql/share/swedish/errmsg.txt:
Warning added
sql/share/ukrainian/errmsg.txt:
Warning added
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index d95271a54bb..b9fc6a53b58 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -446,7 +446,12 @@ String *Item_func_spatial_collection::val_str(String *str) } } if (str->length() > current_thd->variables.max_allowed_packet) + { + push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WARN_ALLOWED_PACKET_OVERFLOWED, + ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name()); goto err; + } null_value = 0; return str; |