diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2017-10-11 11:57:26 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2017-10-11 11:57:26 +0400 |
| commit | fe0d2e1a2b8069b0d8f0560aacb2cc9543b3951b (patch) | |
| tree | 65f56f1063823ec278768ed0c77c9993367c45e6 /sql/item_geofunc.cc | |
| parent | dd85ec6f28b9b5f94188e4a1b907e3a17d6b647c (diff) | |
| download | mariadb-git-fe0d2e1a2b8069b0d8f0560aacb2cc9543b3951b.tar.gz | |
MDEV-13923 Assertion `!is_set() || (m_status == DA_OK_BULK &&
is_bulk_op())' failed upon altering table with geometry field.
Check for the validity of the DEFAULT value for the
geometry field.
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index a271e481814..1fa6b52cf96 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -75,9 +75,9 @@ String *Item_func_geometry_from_text::val_str(String *str) srid= (uint32)args[1]->val_int(); str->set_charset(&my_charset_bin); + str->length(0); if (str->reserve(SRID_SIZE, 512)) return 0; - str->length(0); str->q_append(srid); if ((null_value= !Geometry::create_from_wkt(&buffer, &trs, str, 0))) return 0; |