diff options
| author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:34:13 +0300 |
|---|---|---|
| committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:34:13 +0300 |
| commit | 6c6c3af6aac428df8a934beeba15cc4ce77cbe01 (patch) | |
| tree | 2f8241944db8952e6a54a417414773dd0b5b0b4e /sql/sql_prepare.cc | |
| parent | b4f1f42062d108230b62ad49fedd93ee6e38e168 (diff) | |
| parent | c7c2f8d4a0dedd52795b7f8a6971c35ea46cc016 (diff) | |
| download | mariadb-git-10.2-test1234.tar.gz | |
Merge branch '10.2' into 10.2-mdev986410.2-test1234
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 453ca936a88..b5cdd807cb7 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -277,7 +277,7 @@ protected: virtual bool send_ok(uint server_status, uint statement_warn_count, ulonglong affected_rows, ulonglong last_insert_id, - const char *message); + const char *message, bool skip_flush); virtual bool send_eof(uint server_status, uint statement_warn_count); virtual bool send_error(uint sql_errno, const char *err_msg, const char* sqlstate); @@ -4877,7 +4877,7 @@ bool Protocol_local::send_out_parameters(List<Item_param> *sp_params) bool Protocol_local::send_ok(uint server_status, uint statement_warn_count, ulonglong affected_rows, ulonglong last_insert_id, - const char *message) + const char *message, bool skip_flush) { /* Just make sure nothing is sent to the client, we have grabbed |