diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-07-03 11:59:57 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-07-03 11:59:57 +0300 |
| commit | 01eb6a4a223ece65c7ff1c9124f4d4b528d579b9 (patch) | |
| tree | 649a5b402d0e779673e8295b10098046a53e6799 /sql/sql_lex.cc | |
| parent | 69be8b9d64e0a4e3f3374fd2cb3124b7deaa25a3 (diff) | |
| parent | 9f6614292b8061063e709147b1282dda84c7f018 (diff) | |
| download | mariadb-git-01eb6a4a223ece65c7ff1c9124f4d4b528d579b9.tar.gz | |
merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.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 8e3d6df0540..21858e0352c 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -122,6 +122,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) lex->yacc_yyss=lex->yacc_yyvs=0; lex->ignore_space=test(thd->variables.sql_mode & MODE_IGNORE_SPACE); lex->sql_command=SQLCOM_END; + lex->duplicates= DUP_ERROR; return lex; } @@ -965,7 +966,7 @@ void st_select_lex_node::init_query() { options= 0; linkage= UNSPECIFIED_TYPE; - no_table_names_allowed= uncacheable= dependent= 0; + no_error= no_table_names_allowed= uncacheable= dependent= 0; } void st_select_lex_node::init_select() |