From e6e3b4abc3cb1b0b92dc862810d5571b8b20397f Mon Sep 17 00:00:00 2001
From: Alexey Kopytov <Alexey.Kopytov@Sun.com>
Date: Mon, 28 Dec 2009 16:59:12 +0300
Subject: [PATCH] Fixed a build failure in mysql-trunk-merge caused by a bad
 merge from mysql-5.1-bugteam.

---
 sql/sp_head.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 130a1d3e742..6b62949f4fe 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -2811,9 +2811,9 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
     open_tables stage.
   */
   if (!res || !thd->is_error() ||
-      (thd->main_da.sql_errno() != ER_CANT_REOPEN_TABLE &&
-       thd->main_da.sql_errno() != ER_NO_SUCH_TABLE &&
-       thd->main_da.sql_errno() != ER_UPDATE_TABLE_USED))
+      (thd->stmt_da->sql_errno() != ER_CANT_REOPEN_TABLE &&
+       thd->stmt_da->sql_errno() != ER_NO_SUCH_TABLE &&
+       thd->stmt_da->sql_errno() != ER_UPDATE_TABLE_USED))
     thd->stmt_arena->state= Query_arena::EXECUTED;
 
   /*