diff options
| author | unknown <hf@deer.(none)> | 2004-07-21 19:10:37 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-07-21 19:10:37 +0500 |
| commit | 291fec683cde70e45f908d4b86e1b75048a25b96 (patch) | |
| tree | e760e781ebd9feba1f0e8c01f34971bd6e703d70 /sql/item_geofunc.cc | |
| parent | 5c4f8358a506158a95ded66fcbfb11de0cd61be4 (diff) | |
| parent | 08c39dc95d247a38f175f946de640d894db9dc99 (diff) | |
| download | mariadb-git-291fec683cde70e45f908d4b86e1b75048a25b96.tar.gz | |
Merging
mysql-test/r/func_str.result:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
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 66a223f0ebf..00553737a21 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; |