Commit 7474deec authored by Alexander Barkov's avatar Alexander Barkov

MDEV-20708 Change make_table_field() to get TABLE_SHARE rather than TABLE

parent 02dea3ff
This diff is collapsed.
This diff is collapsed.
...@@ -475,11 +475,11 @@ Field *Type_handler_geometry::make_table_field(MEM_ROOT *root, ...@@ -475,11 +475,11 @@ Field *Type_handler_geometry::make_table_field(MEM_ROOT *root,
const LEX_CSTRING *name, const LEX_CSTRING *name,
const Record_addr &addr, const Record_addr &addr,
const Type_all_attributes &attr, const Type_all_attributes &attr,
TABLE *table) const TABLE_SHARE *share) const
{ {
return new (root) return new (root)
Field_geom(addr.ptr(), addr.null_ptr(), addr.null_bit(), Field_geom(addr.ptr(), addr.null_ptr(), addr.null_bit(),
Field::NONE, name, table->s, 4, this, 0); Field::NONE, name, share, 4, this, 0);
} }
......
...@@ -119,7 +119,7 @@ class Type_handler_geometry: public Type_handler_string_result ...@@ -119,7 +119,7 @@ class Type_handler_geometry: public Type_handler_string_result
const LEX_CSTRING *name, const LEX_CSTRING *name,
const Record_addr &addr, const Record_addr &addr,
const Type_all_attributes &attr, const Type_all_attributes &attr,
TABLE *table) const override; TABLE_SHARE *share) const override;
Field *make_table_field_from_def(TABLE_SHARE *share, Field *make_table_field_from_def(TABLE_SHARE *share,
MEM_ROOT *mem_root, MEM_ROOT *mem_root,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment