diff options
| author | bell@sanja.is.com.ua <> | 2004-08-31 10:06:38 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-08-31 10:06:38 +0300 |
| commit | 392c306969d8d07b9d3f5d0f1a77d531752f7371 (patch) | |
| tree | 5f2f79152aa536016bbf28ae6e6b0e70d5087d25 /sql/sp_head.cc | |
| parent | 7682b10ee84461f03a33cacbcec1bbe36f6e3f87 (diff) | |
| download | mariadb-git-392c306969d8d07b9d3f5d0f1a77d531752f7371.tar.gz | |
fixed open_and_lock_tables result processing (all open_and_lock_tables revision)
fixed printing of COLLATE operation
(BUG#5155)
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 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) |