diff options
author | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-11-12 15:39:02 +0530 |
---|---|---|
committer | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-11-12 15:39:02 +0530 |
commit | b2029c0300bf8c311ff5d9fdc4b73a9e48bf6930 (patch) | |
tree | 54818fcbe17fc94f7c57580d5c2a2386cafe183b /sql/log.h | |
parent | 972dc6ee98b6447363ccbc5dcb921d3542d7d238 (diff) | |
parent | bafb011a82c0a6437515c37e37aef433d043f592 (diff) | |
download | mariadb-git-b2029c0300bf8c311ff5d9fdc4b73a9e48bf6930.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/log.h')
-rw-r--r-- | sql/log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index 4b80bdfd81f..8ba39614825 100644 --- a/sql/log.h +++ b/sql/log.h @@ -720,7 +720,7 @@ public: { bytes_written = 0; } - void harvest_bytes_written(ulonglong* counter) + void harvest_bytes_written(Atomic_counter<uint64> *counter) { #ifndef DBUG_OFF char buf1[22],buf2[22]; |