diff options
author | unknown <bell@sanja.is.com.ua> | 2003-08-01 18:24:27 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2003-08-01 18:24:27 +0300 |
commit | 875a26d50a7685def420be8712068f8e880adf7e (patch) | |
tree | de5617c39a1d780f524e2dd50c59216b6e5d6290 /sql/sql_lex.cc | |
parent | c44af18bd59a2ab4ff80fe1d82a6053dbccc8647 (diff) | |
parent | 668cd9729f8f1a35ebd6eb95bec9b612b7596f16 (diff) | |
download | mariadb-git-875a26d50a7685def420be8712068f8e880adf7e.tar.gz |
merge
sql/item.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index d4bb3bf12a2..57e39a0dc83 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -986,7 +986,8 @@ void st_select_lex::init_query() join= 0; where= 0; olap= UNSPECIFIED_OLAP_TYPE; - insert_select= having_fix_field= 0; + having_fix_field= 0; + resolve_mode= NOMATTER_MODE; with_wild= 0; } |