mirror of
https://github.com/MariaDB/server.git
synced 2026-04-28 11:15:33 +02:00
merge
sql/sql_olap.cc: Auto merged sql/sql_select.cc: Auto merged
This commit is contained in:
commit
9e65ac47ea
2 changed files with 6 additions and 3 deletions
|
|
@ -4040,9 +4040,12 @@ static bool create_myisam_tmp_table(TABLE *table,TMP_TABLE_PARAM *param,
|
|||
}
|
||||
MI_CREATE_INFO create_info;
|
||||
bzero((char*) &create_info,sizeof(create_info));
|
||||
if ((options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) ==
|
||||
OPTION_BIG_TABLES)
|
||||
if ((options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) !=
|
||||
SELECT_SMALL_RESULT)
|
||||
{
|
||||
create_info.data_file_length= ~(ulonglong) 0;
|
||||
create_info.max_rows= ~(ulonglong) 0;
|
||||
}
|
||||
|
||||
if ((error=mi_create(table->real_name,table->keys,&keydef,
|
||||
(uint) (param->recinfo-param->start_recinfo),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue