diff options
| author | unknown <hf@deer.(none)> | 2004-07-21 21:27:45 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-07-21 21:27:45 +0500 |
| commit | 8df1bf6b4206d64f68ba2eb2179bcb7e2c852d1e (patch) | |
| tree | 817dd6e68afd3533bb246b6a2da619a5cab24b40 /sql/item_geofunc.cc | |
| parent | c5fc0d433ab28d4309297875092888c920dcde3f (diff) | |
| download | mariadb-git-8df1bf6b4206d64f68ba2eb2179bcb7e2c852d1e.tar.gz | |
Final patch for WL#1600(warn if max_allowed_packet used)
mysql-test/r/func_str.result:
test fixed
mysql-test/r/packet.result:
test fixed
sql/item_geofunc.cc:
error message fixed
sql/item_strfunc.cc:
error message fixed
sql/share/czech/errmsg.txt:
error message fixed
sql/share/danish/errmsg.txt:
error message fixed
sql/share/dutch/errmsg.txt:
error message fixed
sql/share/english/errmsg.txt:
error message fixed
sql/share/estonian/errmsg.txt:
error message fixed
sql/share/french/errmsg.txt:
error message fixed
sql/share/german/errmsg.txt:
error message fixed
sql/share/greek/errmsg.txt:
error message fixed
sql/share/hungarian/errmsg.txt:
error message fixed
sql/share/italian/errmsg.txt:
error message fixed
sql/share/japanese/errmsg.txt:
error message fixed
sql/share/korean/errmsg.txt:
error message fixed
sql/share/norwegian-ny/errmsg.txt:
error message fixed
sql/share/norwegian/errmsg.txt:
error message fixed
sql/share/polish/errmsg.txt:
error message fixed
sql/share/portuguese/errmsg.txt:
error message fixed
sql/share/romanian/errmsg.txt:
error message fixed
sql/share/russian/errmsg.txt:
error message fixed
sql/share/serbian/errmsg.txt:
error message fixed
sql/share/slovak/errmsg.txt:
error message fixed
sql/share/spanish/errmsg.txt:
error message fixed
sql/share/swedish/errmsg.txt:
error message fixed
sql/share/ukrainian/errmsg.txt:
error message fixed
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 00553737a21..9d58cc37c2a 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -449,7 +449,8 @@ String *Item_func_spatial_collection::val_str(String *str) { push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_ALLOWED_PACKET_OVERFLOWED, - ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name()); + ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), + func_name(), current_thd->variables.max_allowed_packet); goto err; } |