diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 19:44:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 19:44:41 +0200 |
| commit | 6dd302d164d13d6c4793af9f03412ee092652226 (patch) | |
| tree | 40a566b6c1971bbf8bbf9d4e36c42f17dad84ef3 /sql/sql_select.h | |
| parent | 0ca2ea1a6550bb718efc878ed451be69e8244cd4 (diff) | |
| parent | cca611d1c083286396e34d8fc242bbeb90f01d2a (diff) | |
| download | mariadb-git-6dd302d164d13d6c4793af9f03412ee092652226.tar.gz | |
Merge bb-10.2-ext into 10.3
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 0f9b38eb7c8..82df7d2930f 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -2343,8 +2343,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); |