summaryrefslogtreecommitdiff
path: root/sql/item_geofunc.cc
diff options
context:
space:
mode:
authorhf@deer.(none) <>2004-06-29 19:55:13 +0500
committerhf@deer.(none) <>2004-06-29 19:55:13 +0500
commiteb67909bf4a280c14267940d27172f7671aa2716 (patch)
tree59be5629c3d654d6e28ff306d4e15ffad39fb346 /sql/item_geofunc.cc
parent6acd105b16da4f825f7be335c36258d8586e10af (diff)
downloadmariadb-git-eb67909bf4a280c14267940d27172f7671aa2716.tar.gz
WL#1600 (Warn if result is truncatet due to max_allowed_packet)
Diffstat (limited to 'sql/item_geofunc.cc')
-rw-r--r--sql/item_geofunc.cc5
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;