diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-07-29 18:37:15 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-07-29 18:37:15 +0300 |
| commit | 9e65ac47ea5060ebd90832e3804b801a37155b52 (patch) | |
| tree | c7e2b6651fb9922eedf694bd45debb64e926fe9f /sql | |
| parent | 3e8e41406d872d012bf1fb587daf048effc405b4 (diff) | |
| parent | 1cf88037420c61a72a36a29b0b3a8b45b04fa977 (diff) | |
| download | mariadb-git-9e65ac47ea5060ebd90832e3804b801a37155b52.tar.gz | |
merge
sql/sql_olap.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_olap.cc | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_olap.cc b/sql/sql_olap.cc index fa4d23805f4..930e052ab90 100644 --- a/sql/sql_olap.cc +++ b/sql/sql_olap.cc @@ -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) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 2f12d7d1012..adfccfce68a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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), |