diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-13 21:54:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-13 21:54:21 +0200 |
| commit | d7a582489900ea175d9659304c4fdc39b3880014 (patch) | |
| tree | 06a2485b15b84fedf197c573276441ea8d8bccb0 /sql/log.h | |
| parent | 97569d3c37a66bc941b933ac7c2cefa5430a5175 (diff) | |
| parent | b2029c0300bf8c311ff5d9fdc4b73a9e48bf6930 (diff) | |
| download | mariadb-git-d7a582489900ea175d9659304c4fdc39b3880014.tar.gz | |
Merge 10.4 into 10.5
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 58e681985eb..eaf7cde1c07 100644 --- a/sql/log.h +++ b/sql/log.h @@ -728,7 +728,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]; |