diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-10-30 13:18:52 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-10-30 13:18:52 +0200 |
| commit | 0bb1e716bcb14aa8321893b906aaf79f32b7c577 (patch) | |
| tree | 27649c1870a43321e1b60ed8b0693461db05b8f1 /sql/item_sum.cc | |
| parent | fc4c9c01ee8105888b75f01728f651c4c496cc22 (diff) | |
| download | mariadb-git-0bb1e716bcb14aa8321893b906aaf79f32b7c577.tar.gz | |
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)
fixed some possible bugs
sql/item.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/item_subselect.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/item_sum.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/mysql_priv.h:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_base.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_cache.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_delete.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_lex.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_lex.h:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
fixed some possible bugs
sql/sql_parse.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_prepare.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_repl.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_select.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_union.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_update.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_yacc.yy:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 46e6b146380..66d88df4239 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -943,7 +943,10 @@ bool Item_sum_count_distinct::fix_fields(THD *thd, TABLE_LIST *tables, bool Item_sum_count_distinct::setup(THD *thd) { List<Item> list; - SELECT_LEX *select_lex= current_lex->select; + SELECT_LEX *select_lex= (SELECT_LEX *)current_lex->current_select; + if (select_lex->linkage == GLOBAL_OPTIONS_TYPE) + return 1; + /* Create a table with an unique key over all parameters */ for (uint i=0; i < arg_count ; i++) { |