diff options
| author | Alexander Barkov <bar@mariadb.com> | 2023-03-14 05:29:04 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2023-03-14 10:04:07 +0400 |
| commit | bf15c8600ac924924a305e40d1dd159564efe7d5 (patch) | |
| tree | d683d687d7912b8feb1e77568bc1a8b933b5c7ef /sql/field.h | |
| parent | d77aaa6994b30660bd8788d3415ae4a44f55d9a0 (diff) | |
| download | mariadb-git-bb-11.0-bar-MDEV-30805.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/field.h')
| -rw-r--r-- | sql/field.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/field.h b/sql/field.h index 13d80099124..d4b59a88f59 100644 --- a/sql/field.h +++ b/sql/field.h @@ -5377,7 +5377,7 @@ public: bool sp_prepare_create_field(THD *thd, MEM_ROOT *mem_root); bool prepare_stage1(THD *thd, MEM_ROOT *mem_root, - handler *file, ulonglong table_flags, + column_definition_type_t type, const Column_derived_attributes *derived_attr); void prepare_stage1_simple(CHARSET_INFO *cs) { @@ -5385,11 +5385,9 @@ public: create_length_to_internal_length_simple(); } bool prepare_stage1_typelib(THD *thd, MEM_ROOT *mem_root, - handler *file, ulonglong table_flags); - bool prepare_stage1_string(THD *thd, MEM_ROOT *mem_root, - handler *file, ulonglong table_flags); - bool prepare_stage1_bit(THD *thd, MEM_ROOT *mem_root, - handler *file, ulonglong table_flags); + column_definition_type_t deftype); + bool prepare_stage1_string(THD *thd, MEM_ROOT *mem_root); + bool prepare_stage1_bit(THD *thd, MEM_ROOT *mem_root); bool bulk_alter(const Column_derived_attributes *derived_attr, const Column_bulk_alter_attributes *bulk_attr) |