diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-22 14:45:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-22 14:45:55 +0300 |
| commit | 455cf6196c8c73f5a50004ac7f31a9be8ac14bbe (patch) | |
| tree | 2d9d696bba2590c63278fee0047a046f58b51a31 /sql/field.cc | |
| parent | 42af2b1d8b8a8508c5aac5c2e0bcf4554c5200ce (diff) | |
| parent | e52a36d37be2fa8a2da8a987cb38cb0bb65233f4 (diff) | |
| download | mariadb-git-455cf6196c8c73f5a50004ac7f31a9be8ac14bbe.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 6153ad64fca..a1c2f1c46c2 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -9049,7 +9049,7 @@ int Field_geom::store(const char *from, size_t length, CHARSET_INFO *cs) my_error(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, MYF(0), Geometry::ci_collection[geom_type]->m_name.str, - wkt.c_ptr(), db, tab_name, field_name.str, + wkt.c_ptr_safe(), db, tab_name, field_name.str, (ulong) table->in_use->get_stmt_da()-> current_row_for_warning()); |