database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch 'github/10.3' into bb-10.3-temporal

Browse Source
This commit is contained in:
Sergei Golubchik
2018-01-17 00:45:02 +01:00
parent 715a507e33 d87531a6a0
commit 8f102b584d
186 changed files with 3130 additions and 1853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -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)