diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-04-12 14:26:06 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-04-12 14:26:06 +0200 |
| commit | ce55d37929fc91b476541d3a77336a44b20317ac (patch) | |
| tree | 867bf056f51f0338af221431380445d7784b2c0e /sql/sp_rcontext.cc | |
| parent | fcd29b78456a47b00763fe249bbee9456bfbf6bb (diff) | |
| parent | 3a3a91ff051abe859589e33fab4b5588e325d55b (diff) | |
| download | mariadb-git-ce55d37929fc91b476541d3a77336a44b20317ac.tar.gz | |
Merge Mariadb 5.1->5.2
Diffstat (limited to 'sql/sp_rcontext.cc')
| -rw-r--r-- | sql/sp_rcontext.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc index 686e1a1346f..18c80b2b054 100644 --- a/sql/sp_rcontext.cc +++ b/sql/sp_rcontext.cc @@ -651,7 +651,7 @@ int Select_fetch_into_spvars::prepare(List<Item> &fields, SELECT_LEX_UNIT *u) } -bool Select_fetch_into_spvars::send_data(List<Item> &items) +int Select_fetch_into_spvars::send_data(List<Item> &items) { List_iterator_fast<struct sp_variable> spvar_iter(*spvar_list); List_iterator_fast<Item> item_iter(items); @@ -668,7 +668,7 @@ bool Select_fetch_into_spvars::send_data(List<Item> &items) for (; spvar= spvar_iter++, item= item_iter++; ) { if (thd->spcont->set_variable(thd, spvar->offset, &item)) - return TRUE; + return 1; } - return FALSE; + return 0; } |