summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 2bc9b170fc1..1b091f29a6b 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2394,8 +2394,6 @@ null:
General functions for spatial objects
********************************************************/
-#include "gstream.h"
-
String *Item_func_geometry_from_text::val_str(String *str)
{
Geometry geom;
@@ -2715,7 +2713,7 @@ String *Item_func_spatial_collection::val_str(String *str)
}
}
- if (str->length() > max_allowed_packet)
+ if (str->length() > current_thd->variables.max_allowed_packet)
goto ret;
null_value = 0;