summaryrefslogtreecommitdiff
path: root/sql/json_table.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/json_table.cc
parentd77aaa6994b30660bd8788d3415ae4a44f55d9a0 (diff)
downloadmariadb-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/json_table.cc')
-rw-r--r--sql/json_table.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/json_table.cc b/sql/json_table.cc
index d404a54bc3f..ded221269ad 100644
--- a/sql/json_table.cc
+++ b/sql/json_table.cc
@@ -792,8 +792,9 @@ bool Create_json_table::add_json_table_fields(THD *thd, TABLE *table,
*/
sql_f->length= sql_f->char_length;
- if (sql_f->prepare_stage1(thd, thd->mem_root, table->file,
- table->file->ha_table_flags(), &da))
+ if (sql_f->prepare_stage1(thd, thd->mem_root,
+ COLUMN_DEFINITION_TABLE_FIELD,
+ &da))
goto err_exit;
while ((jc2= it2++) != jc)