summaryrefslogtreecommitdiff
path: root/sql/sp_rcontext.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-04-12 14:26:06 +0200
committerunknown <knielsen@knielsen-hq.org>2011-04-12 14:26:06 +0200
commitce55d37929fc91b476541d3a77336a44b20317ac (patch)
tree867bf056f51f0338af221431380445d7784b2c0e /sql/sp_rcontext.h
parentfcd29b78456a47b00763fe249bbee9456bfbf6bb (diff)
parent3a3a91ff051abe859589e33fab4b5588e325d55b (diff)
downloadmariadb-git-ce55d37929fc91b476541d3a77336a44b20317ac.tar.gz
Merge Mariadb 5.1->5.2
Diffstat (limited to 'sql/sp_rcontext.h')
-rw-r--r--sql/sp_rcontext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index ecd11453e49..15815e496dd 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -254,7 +254,7 @@ public:
void set_spvar_list(List<struct sp_variable> *vars) { spvar_list= vars; }
virtual bool send_eof() { return FALSE; }
- virtual bool send_data(List<Item> &items);
+ virtual int send_data(List<Item> &items);
virtual int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
};