diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-11 08:41:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-11 08:41:36 +0300 |
| commit | d04f2de80a96b3ff9290ee27507195bfb01fc77f (patch) | |
| tree | 49da698fbe99c5888f41238b0cda4e1eedebf2e2 /mysys | |
| parent | 5e17b1f7cbfc256850ed139a0a4898040e16ff60 (diff) | |
| parent | b05be3ef8c8668ddbcbe8e1c08dcd4fcc88eb4cf (diff) | |
| download | mariadb-git-d04f2de80a96b3ff9290ee27507195bfb01fc77f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_lockmem.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/my_lockmem.c b/mysys/my_lockmem.c index b70d5948111..e159502a278 100644 --- a/mysys/my_lockmem.c +++ b/mysys/my_lockmem.c @@ -20,7 +20,6 @@ #include <my_list.h> #ifdef HAVE_MLOCK -#include <sys/mman.h> struct st_mem_list { |