diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-07-01 10:03:20 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-07-01 10:03:20 +0300 |
| commit | 8db5021725c39823511d36d800299a2f4b2efda3 (patch) | |
| tree | cd54e2149de2b87d2e445802361904126b9c15ef /sql/sql_lex.cc | |
| parent | 0a1d7d64c85894fda6ff1f6342b167d22110dbf7 (diff) | |
| parent | cd01f7cda08f8cff241e02835a16fc5aca6280e2 (diff) | |
| download | mariadb-git-8db5021725c39823511d36d800299a2f4b2efda3.tar.gz | |
merged
sql/item_subselect.cc:
Auto merged
sql/mysqld.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.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 1658d5d14c1..2eeb57f34a7 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; ref_pointer_array= 0; cond_count= 0; } |