diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-11-25 11:22:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-11-25 11:22:10 +0400 |
| commit | 00ed55c71ab08045d79917ae3a749d2c3dae25cf (patch) | |
| tree | 83b774822a3c8fc88402b10517d7a7a56ac4ca6e /sql/rpl_utility.cc | |
| parent | a099686e2e9fdc3d7dc2948cc13165c9e8aaf11d (diff) | |
| download | mariadb-git-00ed55c71ab08045d79917ae3a749d2c3dae25cf.tar.gz | |
A joint patch for:
- MDEV-8093 sql_yacc.yy: add %type create_field for field_spec and column_def
and partially:
- MDEV-8095 Split Create_field
Diffstat (limited to 'sql/rpl_utility.cc')
| -rw-r--r-- | sql/rpl_utility.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index d1dd0298a1f..1c48d6bc937 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -937,7 +937,7 @@ TABLE *table_def::create_conversion_table(THD *thd, rpl_group_info *rgi, { DBUG_ENTER("table_def::create_conversion_table"); - List<Create_field> field_list; + List<Column_definition> field_list; TABLE *conv_table= NULL; Relay_log_info *rli= rgi->rli; /* @@ -948,7 +948,7 @@ TABLE *table_def::create_conversion_table(THD *thd, rpl_group_info *rgi, uint const cols_to_create= MY_MIN(target_table->s->fields, size()); for (uint col= 0 ; col < cols_to_create; ++col) { - Create_field *field_def= + Column_definition *field_def= (Create_field*) alloc_root(thd->mem_root, sizeof(Create_field)); bool unsigned_flag= 0; if (field_list.push_back(field_def, thd->mem_root)) |