mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
fixed bug in determinating uncacheable queries
new fatal_error interface to assign is_fatal_error and ne.report_error commant about Item_row mysql-test/r/subselect.result: test of inheritence of uncacheability mysql-test/t/subselect.test: test of inheritence of uncacheability sql/item.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/item_func.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/item_row.cc: comment about row sql/item_subselect.cc: new fatal_error interface to assign is_fatal_error and ne.report_error (message should be sent by allocate routine sql/log_event.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/mysqld.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/protocol.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_base.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_class.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_class.h: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_delete.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_insert.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_lex.h: fixed bug in determinating uncacheable queries sql/sql_parse.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_prepare.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_select.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_show.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_union.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_update.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/thr_malloc.cc: new fatal_error interface to assign is_fatal_error and ne.report_error
This commit is contained in:
@ -203,7 +203,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result,
|
||||
(ORDER*) NULL,
|
||||
sl, this, 0, tables_OK);
|
||||
tables_OK= 0;
|
||||
if (res | thd->fatal_error)
|
||||
if (res | thd->is_fatal_error)
|
||||
goto err;
|
||||
}
|
||||
item_list.empty();
|
||||
@ -220,7 +220,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result,
|
||||
}
|
||||
}
|
||||
|
||||
DBUG_RETURN(res | thd->fatal_error);
|
||||
DBUG_RETURN(res | thd->is_fatal_error);
|
||||
err:
|
||||
thd->lex.current_select= lex_select_save;
|
||||
DBUG_RETURN(-1);
|
||||
@ -293,7 +293,7 @@ int st_select_lex_unit::exec()
|
||||
thd->lex.select_lex.ftfunc_list= &empty_list;
|
||||
#endif
|
||||
|
||||
if (!thd->fatal_error) // Check if EOM
|
||||
if (!thd->is_fatal_error) // Check if EOM
|
||||
{
|
||||
SELECT_LEX *sl=thd->lex.current_select->master_unit()->first_select();
|
||||
offset_limit_cnt= (sl->braces) ? global_parameters->offset_limit : 0;
|
||||
|
Reference in New Issue
Block a user