diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-06-26 11:31:13 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-06-26 11:31:13 +0300 |
| commit | 662506e0939be04a8201efe4ce172d97dcf4bf9b (patch) | |
| tree | f3a100b7ab513c9a7167a8ced98791706e58dfca /sql/sql_lex.h | |
| parent | 65ec2112f1c111c9d00504f9873643ecd25b1a83 (diff) | |
| parent | 54cd790bf3bfb57624d516ad22c432c5a1ff7958 (diff) | |
| download | mariadb-git-662506e0939be04a8201efe4ce172d97dcf4bf9b.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-cond_count-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top2-4.1
mysql-test/r/subselect.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 865336a06fa..83b38180250 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -207,6 +207,7 @@ public: Item **ref_pointer_array; uint select_items; /* number of items in select_list */ + uint cond_count; /* number of arguments of and/or/xor in where/having */ enum_parsing_place parsing_place; /* where we are parsing expression */ bool with_sum_func; /* sum function indicator */ bool dependent; /* dependent from outer select subselect */ |