database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-11-21 20:08:12 +02:00
parent 97a1970658 21eb2e2eae
commit 072d38eb12
52 changed files with 1333 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_lex.cc
View File

@ -150,7 +150,7 @@ void lex_start(THD *thd, uchar *buf,uint length)
lex->found_colon= 0;
lex->safe_to_cache_query= 1;
lex->time_zone_tables_used= 0;
lex->proc_table= lex->query_tables= 0;
lex->leaf_tables_insert= lex->proc_table= lex->query_tables= 0;
lex->query_tables_last= &lex->query_tables;
lex->variables_used= 0;
lex->select_lex.parent_lex= lex;
@ -1049,7 +1049,7 @@ void st_select_lex::init_query()
table_list.empty();
top_join_list.empty();
join_list= &top_join_list;
embedding= 0;
embedding= leaf_tables= 0;
item_list.empty();
join= 0;
where= prep_where= 0;
@ -1644,7 +1644,7 @@ bool st_lex::can_be_merged()
select_lex.group_list.elements == 0 &&
select_lex.having == 0 &&
select_lex.with_sum_func == 0 &&
select_lex.table_list.elements == 1 &&
select_lex.table_list.elements >= 1 &&
!(select_lex.options & SELECT_DISTINCT) &&
select_lex.select_limit == HA_POS_ERROR);
}