summaryrefslogtreecommitdiff
path: root/sql/protocol.h
diff options
context:
space:
mode:
authorGalina Shalygina <galashalygina@gmail.com>2016-05-25 00:34:13 +0300
committerGalina Shalygina <galashalygina@gmail.com>2016-05-25 00:34:13 +0300
commit6c6c3af6aac428df8a934beeba15cc4ce77cbe01 (patch)
tree2f8241944db8952e6a54a417414773dd0b5b0b4e /sql/protocol.h
parentb4f1f42062d108230b62ad49fedd93ee6e38e168 (diff)
parentc7c2f8d4a0dedd52795b7f8a6971c35ea46cc016 (diff)
downloadmariadb-git-10.2-test1234.tar.gz
Merge branch '10.2' into 10.2-mdev986410.2-test1234
Diffstat (limited to 'sql/protocol.h')
-rw-r--r--sql/protocol.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.h b/sql/protocol.h
index ea33c6bbb45..6397e3dd5e6 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -62,7 +62,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);