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/item_sum.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/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index e44a371d264..b876d8c63f4 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -886,8 +886,8 @@ bool Aggregator_distinct::setup(THD *thd) } else { - List<Create_field> field_list; - Create_field field_def; /* field definition */ + List<Column_definition> field_list; + Column_definition field_def; /* field definition */ Item *arg; DBUG_ENTER("Aggregator_distinct::setup"); /* It's legal to call setup() more than once when in a subquery */ |