From b9121cdea38b75aabc5a29a769ee409c962f42e0 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2003 14:54:37 -0400 Subject: made lex a pointer in THD --- sql/item_sum.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/item_sum.cc') diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 653f71e3d79..3a91b86f04f 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++; + current_thd->lex->current_select->with_sum_func++; with_sum_func= 1; } -- cgit v1.2.1 From 2b16d5457b88f5c0b6099fd38b528a2387978ecd Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Jul 2003 17:07:12 +0200 Subject: Merging 4.1 into 5.0 (second pass; post-merge fixes). One test in subselect.test still wrong. Had to reconstruct all errmsg.txt files completely, since auto-merge made a mess of the lot. :-( mysql-test/r/sp-error.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/r/subselect.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). One test still wrong (different from 4.1), left for Sanja. :) mysql-test/r/variables.result: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/t/sp-error.test: Merging 4.1 into 5.0 (second pass; post-merge fixes). mysql-test/t/subselect.test: Merging 4.1 into 5.0 (second pass; post-merge fixes). One test still wrong (different from 4.1), left for Sanja :) scripts/mysql_create_system_tables.sh: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_cmpfunc.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_subselect.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/item_sum.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/mysql_priv.h: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/mysqld.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/danish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/dutch/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/english/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/estonian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/french/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/german/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/greek/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/hungarian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/italian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/japanese/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/korean/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/norwegian-ny/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/norwegian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/polish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/portuguese/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/russian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/serbian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/slovak/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/spanish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/swedish/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/share/ukrainian/errmsg.txt: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sp.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_base.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_cache.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_insert.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_parse.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_select.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). sql/sql_update.cc: Merging 4.1 into 5.0 (second pass; post-merge fixes). --- sql/item_sum.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/item_sum.cc') diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 538185da2e3..792ccc22939 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1114,7 +1114,7 @@ void Item_sum_count_distinct::make_unique() bool Item_sum_count_distinct::setup(THD *thd) { List list; - SELECT_LEX *select_lex= thd->lex.current_select->select_lex(); + SELECT_LEX *select_lex= thd->lex->current_select->select_lex(); if (select_lex->linkage == GLOBAL_OPTIONS_TYPE) return 1; @@ -1608,7 +1608,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 *select_lex= item_thd->lex->current_select->select_lex(); order= 0; group_concat_max_len= item_thd->variables.group_concat_max_len; @@ -1790,7 +1790,7 @@ bool Item_func_group_concat::setup(THD *thd) { DBUG_ENTER("Item_func_group_concat::setup"); List list; - SELECT_LEX *select_lex= thd->lex.current_select->select_lex(); + SELECT_LEX *select_lex= thd->lex->current_select->select_lex(); if (select_lex->linkage == GLOBAL_OPTIONS_TYPE) DBUG_RETURN(1); -- cgit v1.2.1