diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-02 07:52:29 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-02 07:52:29 +0300 |
| commit | 55b806b5177373d841605fc0bedcf1227af2b6d9 (patch) | |
| tree | fffb1beb55f2389f5dbbe6bf6cf0da9d0f09939e /sql/sp_head.cc | |
| parent | 711e8879054f2499b00452762ade52430ce41c44 (diff) | |
| parent | 1bbf71849f8f7fe2c5516c07f44207a1344559d6 (diff) | |
| download | mariadb-git-55b806b5177373d841605fc0bedcf1227af2b6d9.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
sql/item.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index b2d3b8202c8..4c5451c253d 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1193,7 +1193,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) @@ -1294,7 +1294,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) @@ -1351,7 +1351,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) @@ -1407,7 +1407,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) |