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/sql_prepare.cc | |
| parent | fcd29b78456a47b00763fe249bbee9456bfbf6bb (diff) | |
| parent | 3a3a91ff051abe859589e33fab4b5588e325d55b (diff) | |
| download | mariadb-git-ce55d37929fc91b476541d3a77336a44b20317ac.tar.gz | |
Merge Mariadb 5.1->5.2
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index c7109982f93..1a3c4f4f8ae 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -106,7 +106,7 @@ class Select_fetch_protocol_binary: public select_send public: Select_fetch_protocol_binary(THD *thd); virtual bool send_fields(List<Item> &list, uint flags); - virtual bool send_data(List<Item> &items); + virtual int send_data(List<Item> &items); virtual bool send_eof(); #ifdef EMBEDDED_LIBRARY void begin_dataset() @@ -2840,11 +2840,11 @@ bool Select_fetch_protocol_binary::send_eof() } -bool +int Select_fetch_protocol_binary::send_data(List<Item> &fields) { Protocol *save_protocol= thd->protocol; - bool rc; + int rc; thd->protocol= &protocol; rc= select_send::send_data(fields); |