diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-07-21 20:22:13 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-07-21 20:22:13 +0300 |
| commit | 3efc721a3ce0a3c68dc82166c4134d414dfcdfa8 (patch) | |
| tree | 4e550a89fa4a7b9ad13dea5b2b4eb9983e84e1ad /sql/sp_rcontext.cc | |
| parent | 4fd42a4e995986839e1636c7d87e17fbfcc8fcd5 (diff) | |
| parent | 28287c0dc5fac4a712019fd7c9a59b71c7d551a9 (diff) | |
| download | mariadb-git-3efc721a3ce0a3c68dc82166c4134d414dfcdfa8.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
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index 0b2b20fe3b3..7fa44f217f6 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -40,12 +40,19 @@ sp_rcontext::sp_rcontext(uint fsize, uint hmax, uint cmax) m_saved.empty(); } -void +int sp_rcontext::set_item_eval(uint idx, Item *i, enum_field_types type) { extern Item *sp_eval_func_item(THD *thd, Item *it, enum_field_types type); + Item *it= sp_eval_func_item(current_thd, i, type); - set_item(idx, sp_eval_func_item(current_thd, i, type)); + if (! it) + return -1; + else + { + set_item(idx, it); + return 0; + } } int |