1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a build failure in mysql-trunk-merge caused by a bad

Browse Source 
merge from mysql-5.1-bugteam.
This commit is contained in:
Alexey Kopytov 2009-12-28 16:59:12 +03:00
parent 3ba6a2a9fa
commit e6e3b4abc3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sp_head.cc
View File

@ -2811,9 +2811,9 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
open_tables stage. open_tables stage.
*/ */
if (!res || !thd->is_error() || if (!res || !thd->is_error() ||
(thd->main_da.sql_errno() != ER_CANT_REOPEN_TABLE && (thd->stmt_da->sql_errno() != ER_CANT_REOPEN_TABLE &&
thd->main_da.sql_errno() != ER_NO_SUCH_TABLE && thd->stmt_da->sql_errno() != ER_NO_SUCH_TABLE &&
thd->main_da.sql_errno() != ER_UPDATE_TABLE_USED)) thd->stmt_da->sql_errno() != ER_UPDATE_TABLE_USED))
thd->stmt_arena->state= Query_arena::EXECUTED; thd->stmt_arena->state= Query_arena::EXECUTED;
/* /*