diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-30 12:45:38 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-30 12:45:38 -0500 |
commit | 4a6be51f78e79b1ee5bc0442b7af8b3108a64512 (patch) | |
tree | c9a15dc1470ff64aa82fe3afdb23503d044e4299 /sql/wsrep_applier.cc | |
parent | 5b6a4f25a566f967e8b1010998a22256bd045511 (diff) | |
download | mariadb-git-4a6be51f78e79b1ee5bc0442b7af8b3108a64512.tar.gz |
* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
Diffstat (limited to 'sql/wsrep_applier.cc')
-rw-r--r-- | sql/wsrep_applier.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 27fe7072813..2d859087217 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -121,7 +121,7 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd, if (!ev) { - WSREP_ERROR("applier could not read binlog event, seqno: %lld, len: %ld", + WSREP_ERROR("applier could not read binlog event, seqno: %lld, len: %zu", (long long)wsrep_thd_trx_seqno(thd), buf_len); rcode= 1; goto error; |