1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source 
sql/sql_olap.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2002-07-29 18:37:15 +03:00
commit 9e65ac47ea
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_olap.cc
View File

@ -46,7 +46,7 @@ static int make_new_olap_select(LEX *lex, SELECT_LEX *select_lex, List<Item> new
{ {
THD *thd=current_thd; THD *thd=current_thd;
Item *item, *new_item; Item *item, *new_item;
Item_string *constant= new Item_string("ALL",3); Item_null *constant= new Item_null("ALL");
SELECT_LEX *new_select = (SELECT_LEX *) thd->memdup((char*) select_lex, sizeof(*select_lex)); SELECT_LEX *new_select = (SELECT_LEX *) thd->memdup((char*) select_lex, sizeof(*select_lex));
if (!new_select) if (!new_select)

7
sql/sql_select.cc
View File

@ -4040,9 +4040,12 @@ static bool create_myisam_tmp_table(TABLE *table,TMP_TABLE_PARAM *param,
} }
MI_CREATE_INFO create_info; MI_CREATE_INFO create_info;
bzero((char*) &create_info,sizeof(create_info)); bzero((char*) &create_info,sizeof(create_info));
if ((options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) == if ((options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) !=
OPTION_BIG_TABLES) SELECT_SMALL_RESULT)
{
create_info.data_file_length= ~(ulonglong) 0; create_info.data_file_length= ~(ulonglong) 0;
create_info.max_rows= ~(ulonglong) 0;
}
if ((error=mi_create(table->real_name,table->keys,&keydef, if ((error=mi_create(table->real_name,table->keys,&keydef,
(uint) (param->recinfo-param->start_recinfo), (uint) (param->recinfo-param->start_recinfo),