summaryrefslogtreecommitdiff
path: root/sql/sql_type_geom.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2023-03-14 05:29:04 +0400
committerAlexander Barkov <bar@mariadb.com>2023-03-14 10:04:07 +0400
commitbf15c8600ac924924a305e40d1dd159564efe7d5 (patch)
treed683d687d7912b8feb1e77568bc1a8b933b5c7ef /sql/sql_type_geom.cc
parentd77aaa6994b30660bd8788d3415ae4a44f55d9a0 (diff)
downloadmariadb-git-bf15c8600ac924924a305e40d1dd159564efe7d5.tar.gz
MDEV-30805 SIGSEGV in my_convert and UBSAN: member access within null pointer of type 'const struct MY_CHARSET_HANDLER' in my_convertbb-11.0-bar-MDEV-30805
Diffstat (limited to 'sql/sql_type_geom.cc')
-rw-r--r--sql/sql_type_geom.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_type_geom.cc b/sql/sql_type_geom.cc
index 5732ae47217..3bdc34b4d65 100644
--- a/sql/sql_type_geom.cc
+++ b/sql/sql_type_geom.cc
@@ -280,8 +280,7 @@ bool Type_handler_geometry::
Column_definition_prepare_stage1(THD *thd,
MEM_ROOT *mem_root,
Column_definition *def,
- handler *file,
- ulonglong table_flags,
+ column_definition_type_t type,
const Column_derived_attributes
*derived_attr) const
{