diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 07:39:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-16 07:39:15 +0300 |
| commit | 9e6e43551fc61bc34152f8d60f5d72f0d3814787 (patch) | |
| tree | 67a834e1fee12ed5d4bf9897aa00146d728d936b /storage/innobase/fil | |
| parent | 4f29d776c756ac522ae49c481ea8975dee8787fe (diff) | |
| parent | 3d0bb2b7f1eb39d1b3773e634499ff98576679f7 (diff) | |
| download | mariadb-git-9e6e43551fc61bc34152f8d60f5d72f0d3814787.tar.gz | |
Merge 10.3 into 10.4
We will expose some more std::atomic internals in Atomic_counter,
so that dict_index_t::lock will support the default assignment operator.
Diffstat (limited to 'storage/innobase/fil')
| -rw-r--r-- | storage/innobase/fil/fil0pagecompress.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/fil/fil0pagecompress.cc b/storage/innobase/fil/fil0pagecompress.cc index e6f23c852dc..b3390a4cd12 100644 --- a/storage/innobase/fil/fil0pagecompress.cc +++ b/storage/innobase/fil/fil0pagecompress.cc @@ -27,7 +27,6 @@ Updated 14/02/2015 #include "fil0fil.h" #include "fil0pagecompress.h" -#include <debug_sync.h> #include <my_dbug.h> #include "mem0mem.h" |