From cd01f7cda08f8cff241e02835a16fc5aca6280e2 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Jun 2003 01:19:09 +0300 Subject: Fixed error handling to be able do not interrupt update (907) (SCRUM) fixed bug of current select pointer in subselect execution fixed layuot mysql-test/r/subselect.result: test of update with IGNORE option and error in subselect mysql-test/t/subselect.test: test of update with IGNORE option and error in subselect sql/item_subselect.cc: fixed bug of current select pointer sql/mysqld.cc: error converting to warnings if hd->lex.current_select->no_error id true layout fixed sql/sql_lex.cc: initialization sql/sql_lex.h: flag which force converting errors to warnings sql/sql_select.cc: switch on error convering to warnings in select executing if IGNORE option present --- sql/sql_lex.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/sql_lex.cc') diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index bc9ad4f36b0..78f981d7759 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; } -- cgit v1.2.1