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/sql_olap.cc | |
| 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/sql_olap.cc')
| -rw-r--r-- | sql/sql_olap.cc | 2 |
1 files changed, 1 insertions, 1 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) |