diff options
| author | holyfoot/hf@mysql.com/deer.(none) <> | 2006-11-17 10:30:16 +0400 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/deer.(none) <> | 2006-11-17 10:30:16 +0400 |
| commit | e95e23b0f3305d498b49809af5793415964afc65 (patch) | |
| tree | cb20b9f192e4db85bad99d431083278909cfe454 /sql/sql_lex.cc | |
| parent | 497ccd6b87b9978fadac6c48d4ae6bd2f689feb7 (diff) | |
| parent | 5198354584e56682e5d5b87ee680582aac44ea61 (diff) | |
| download | mariadb-git-e95e23b0f3305d498b49809af5793415964afc65.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/mysql-5.0-0mrg
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index f39cf39f08e..3de842c8551 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -162,6 +162,7 @@ void lex_start(THD *thd, uchar *buf,uint length) lex->select_lex.ftfunc_list= &lex->select_lex.ftfunc_list_alloc; lex->select_lex.group_list.empty(); lex->select_lex.order_list.empty(); + lex->select_lex.udf_list.empty(); lex->current_select= &lex->select_lex; lex->yacc_yyss=lex->yacc_yyvs=0; lex->ignore_space=test(thd->variables.sql_mode & MODE_IGNORE_SPACE); @@ -1165,6 +1166,7 @@ void st_select_lex::init_select() braces= 0; when_list.empty(); expr_list.empty(); + udf_list.empty(); interval_list.empty(); use_index.empty(); ftfunc_list_alloc.empty(); @@ -1178,7 +1180,7 @@ void st_select_lex::init_select() select_limit= 0; /* denotes the default limit = HA_POS_ERROR */ offset_limit= 0; /* denotes the default offset = 0 */ with_sum_func= 0; - + is_correlated= 0; } /* @@ -1372,6 +1374,8 @@ void st_select_lex::mark_as_dependent(SELECT_LEX *last) SELECT_LEX_UNIT *munit= s->master_unit(); munit->uncacheable|= UNCACHEABLE_DEPENDENT; } + is_correlated= TRUE; + this->master_unit()->item->is_correlated= TRUE; } bool st_select_lex_node::set_braces(bool value) { return 1; } |