diff options
| author | Monty <monty@mariadb.org> | 2016-06-24 02:25:14 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-06-24 02:25:14 +0300 |
| commit | 4dc50758603d6ed2891412fdb6d37cd8b5541999 (patch) | |
| tree | c31def9d565271ff6ca10ec9c15433a12e91bba6 /sql/log.cc | |
| parent | ec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff) | |
| download | mariadb-git-4dc50758603d6ed2891412fdb6d37cd8b5541999.tar.gz | |
Fixed compiler warnings and test failures found by buildbot
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index d230b1ceb0d..39f001af554 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1681,13 +1681,13 @@ static int binlog_close_connection(handlerton *hton, THD *thd) size_t len=0; wsrep_write_cache_buf(cache, &buf, &len); WSREP_WARN("binlog trx cache not empty (%lu bytes) @ connection close %lld", - len, (longlong) thd->thread_id); + (ulong) len, (longlong) thd->thread_id); if (len > 0) wsrep_dump_rbr_buf(thd, buf, len); cache = cache_mngr->get_binlog_cache_log(false); wsrep_write_cache_buf(cache, &buf, &len); WSREP_WARN("binlog stmt cache not empty (%lu bytes) @ connection close %lld", - len, (longlong) thd->thread_id); + (ulong) len, (longlong) thd->thread_id); if (len > 0) wsrep_dump_rbr_buf(thd, buf, len); } #endif /* WITH_WSREP */ |