diff options
| author | pem@mysql.com <> | 2003-09-24 11:29:38 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-09-24 11:29:38 +0200 |
| commit | 8d884c02bb2ca2f2b4bce6dccbaf69d6935e293d (patch) | |
| tree | 4f2fa31d20ec4c9a54f602c624b20c1cf4ddf493 /sql/item_sum.cc | |
| parent | efd94f5ba972bb10d2d10fe46fc9153536941e92 (diff) | |
| parent | b8e4dc03d809838f6f589ef24089e52ea806da33 (diff) | |
| download | mariadb-git-8d884c02bb2ca2f2b4bce6dccbaf69d6935e293d.tar.gz | |
Merging 4.1 -> 5.0
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 2b31e15cb4c..973917bb014 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -57,7 +57,7 @@ Item_sum::Item_sum(THD *thd, Item_sum &item): void Item_sum::mark_as_sum_func() { - current_thd->lex.current_select->with_sum_func= 1; + current_thd->lex->current_select->with_sum_func= 1; with_sum_func= 1; } @@ -1102,7 +1102,7 @@ void Item_sum_count_distinct::make_unique() bool Item_sum_count_distinct::setup(THD *thd) { List<Item> list; - SELECT_LEX *select_lex= thd->lex.current_select; + SELECT_LEX *select_lex= thd->lex->current_select; if (select_lex->linkage == GLOBAL_OPTIONS_TYPE) return 1; @@ -1597,7 +1597,7 @@ Item_func_group_concat::Item_func_group_concat(bool is_distinct, quick_group= 0; mark_as_sum_func(); item_thd= current_thd; - SELECT_LEX *select_lex= item_thd->lex.current_select; + SELECT_LEX *select_lex= item_thd->lex->current_select; order= 0; group_concat_max_len= item_thd->variables.group_concat_max_len; @@ -1778,7 +1778,7 @@ bool Item_func_group_concat::setup(THD *thd) { DBUG_ENTER("Item_func_group_concat::setup"); List<Item> list; - SELECT_LEX *select_lex= thd->lex.current_select; + SELECT_LEX *select_lex= thd->lex->current_select; if (select_lex->linkage == GLOBAL_OPTIONS_TYPE) DBUG_RETURN(1); |