database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50

Browse Source 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
This commit is contained in:
tsmith@maint2.mysql.com
2006-09-13 09:03:52 +02:00
parent a1c4a48b7e e38f04a09f
commit 6a31ec2cad
39 changed files with 612 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_lex.h
View File

@@ -575,6 +575,12 @@ public:
bool braces; /* SELECT ... UNION (SELECT ... ) <- this braces */
/* TRUE when having fix field called in processing of this SELECT */
bool having_fix_field;
/* Number of Item_sum-derived objects in this SELECT */
uint n_sum_items;
/* Number of Item_sum-derived objects in children and descendant SELECTs */
uint n_child_sum_items;
/* explicit LIMIT clause was used */
bool explicit_limit;
/*
@@ -667,7 +673,7 @@ public:
bool test_limit();
friend void lex_start(THD *thd, const uchar *buf, uint length);
st_select_lex() {}
st_select_lex() : n_sum_items(0), n_child_sum_items(0) {}
void make_empty_select()
{
init_query();