Commit 57f32cf8 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

merge

parents 721928ca 7c9658ec

sql/sql_olap.cc

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int make_new_olap_select(LEX *lex, SELECT_LEX *select_lex, List<Item> new 
{

  THD	*thd=current_thd;

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

  if (!new_select)

sql/sql_select.cc

+5 −2
Original line number Diff line number Diff line
@@ -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),