diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-01-17 00:45:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-17 00:45:02 +0100 |
| commit | 8f102b584d4e8f02da924f9be094014136eb453f (patch) | |
| tree | 80e98303b2960d477e1e2223b0a986f5fd6edf0a /sql/sql_select.cc | |
| parent | 715a507e3368451b824f211dea34a55c5d4dac1d (diff) | |
| parent | d87531a6a053fdf8bc828857d9cdc11a97026ad6 (diff) | |
| download | mariadb-git-8f102b584d4e8f02da924f9be094014136eb453f.tar.gz | |
Merge branch 'github/10.3' into bb-10.3-temporalmariadb-10.3.4
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0527eef4fde..d6fe06173a2 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -18358,7 +18358,7 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, table->in_use->inc_status_created_tmp_disk_tables(); table->in_use->inc_status_created_tmp_tables(); share->db_record_offset= 1; - table->created= TRUE; + table->set_created(); DBUG_RETURN(0); err: DBUG_RETURN(1); @@ -18869,8 +18869,8 @@ int rr_sequential_and_unpack(READ_RECORD *info) */ 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) { if (table->s->db_type() == TMP_ENGINE_HTON) |