From 392c306969d8d07b9d3f5d0f1a77d531752f7371 Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Tue, 31 Aug 2004 10:06:38 +0300
Subject: fixed open_and_lock_tables result processing (all
 open_and_lock_tables revision) fixed printing of COLLATE operation (BUG#5155)

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

(limited to 'sql/sp_head.cc')

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index fd95767b7cd..c7cd49d26f5 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1192,7 +1192,7 @@ sp_instr_set::execute(THD *thd, uint *nextp)
   if (tables &&
       ((res= check_table_access(thd, SELECT_ACL, tables, 0)) ||
        (res= open_and_lock_tables(thd, tables))))
-    DBUG_RETURN(-1);
+    DBUG_RETURN(res);
 
   it= sp_eval_func_item(thd, m_value, m_type);
   if (! it)
@@ -1293,7 +1293,7 @@ sp_instr_jump_if::execute(THD *thd, uint *nextp)
   if (tables &&
       ((res= check_table_access(thd, SELECT_ACL, tables, 0)) ||
        (res= open_and_lock_tables(thd, tables))))
-    DBUG_RETURN(-1);
+    DBUG_RETURN(res);
 
   it= sp_eval_func_item(thd, m_expr, MYSQL_TYPE_TINY);
   if (!it)
@@ -1350,7 +1350,7 @@ sp_instr_jump_if_not::execute(THD *thd, uint *nextp)
   if (tables &&
       ((res= check_table_access(thd, SELECT_ACL, tables, 0)) ||
        (res= open_and_lock_tables(thd, tables))))
-    DBUG_RETURN(-1);
+    DBUG_RETURN(res);
 
   it= sp_eval_func_item(thd, m_expr, MYSQL_TYPE_TINY);
   if (! it)
@@ -1406,7 +1406,7 @@ sp_instr_freturn::execute(THD *thd, uint *nextp)
   if (tables &&
       ((res= check_table_access(thd, SELECT_ACL, tables, 0)) ||
        (res= open_and_lock_tables(thd, tables))))
-    DBUG_RETURN(-1);
+    DBUG_RETURN(res);
 
   it= sp_eval_func_item(thd, m_value, m_type);
   if (! it)
-- 
cgit v1.2.1