diff options
| author | unknown <igor@rurik.mysql.com> | 2006-02-02 21:23:36 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-02-02 21:23:36 -0800 |
| commit | 8300149963a83b86c6ae2b1adf1a6f44f374fc8c (patch) | |
| tree | 30c426e55f2f4aa73ad712d97bb4db5876251b77 /sql/sql_lex.h | |
| parent | 6a2a94b50be1c6da3b916702683b8b8162de6afa (diff) | |
| parent | 6757503847039fa8758dffc7263a38a792848685 (diff) | |
| download | mariadb-git-8300149963a83b86c6ae2b1adf1a6f44f374fc8c.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/t/having.test:
Auto merged
mysql-test/r/having.result:
Manual merge
sql/sql_lex.cc:
Manual merge
sql/sql_lex.h:
Manual merge
sql/sql_prepare.cc:
Manual merge
sql/sql_select.cc:
Manual merge
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 5ba47d768fb..7b2ea359fb2 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -474,6 +474,7 @@ public: char *db; Item *where, *having; /* WHERE & HAVING clauses */ Item *prep_where; /* saved WHERE clause for prepared statement processing */ + Item *prep_having;/* saved HAVING clause for prepared statement processing */ /* point on lex in which it was created, used in view subquery detection */ st_lex *parent_lex; enum olap_type olap; |