diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 18:00:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 18:00:31 +0200 |
| commit | cca611d1c083286396e34d8fc242bbeb90f01d2a (patch) | |
| tree | 6905df14f4617bcaac9b0ea8a30b8017e201462f /sql/sql_select.h | |
| parent | 773c3ceb573ea5ae8506237d3648412251ce02e7 (diff) | |
| parent | bf7719111fff5167e160abf869c03a81a3a39592 (diff) | |
| download | mariadb-git-cca611d1c083286396e34d8fc242bbeb90f01d2a.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index e5d3ed1a41f..4e2206dd098 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -2287,8 +2287,8 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, TMP_ENGINE_COLUMNDEF **recinfo, ulonglong options); bool instantiate_tmp_table(TABLE *table, KEY *keyinfo, - MARIA_COLUMNDEF *start_recinfo, - MARIA_COLUMNDEF **recinfo, + TMP_ENGINE_COLUMNDEF *start_recinfo, + TMP_ENGINE_COLUMNDEF **recinfo, ulonglong options); bool open_tmp_table(TABLE *table); void setup_tmp_table_column_bitmaps(TABLE *table, uchar *bitmaps); |