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.cc | |
| 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.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 946b6a28430..1ed8887a878 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1122,7 +1122,7 @@ void st_select_lex::init_query() embedding= leaf_tables= 0; item_list.empty(); join= 0; - having= where= prep_where= 0; + having= prep_having= where= prep_where= 0; olap= UNSPECIFIED_OLAP_TYPE; having_fix_field= 0; context.select_lex= this; |