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 /libmysqld/lib_sql.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 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index a067856b287..bcb45aefbfb 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -1170,7 +1170,8 @@ bool Protocol_binary::write() bool net_send_ok(THD *thd, uint server_status, uint statement_warn_count, - ulonglong affected_rows, ulonglong id, const char *message) + ulonglong affected_rows, ulonglong id, const char *message, + bool unused __attribute__((unused))) { DBUG_ENTER("emb_net_send_ok"); MYSQL_DATA *data; |