summaryrefslogtreecommitdiff
path: root/storage/innobase/mem/mem0mem.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2016-04-22 10:50:45 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-03-17 12:42:07 +0200
commit4e1116b2c6e1b6e0714fb2ed742842f1ee6bfab5 (patch)
tree7a59a39024510120bfbffad661708fe2887365c9 /storage/innobase/mem/mem0mem.cc
parentc63ca3d7f0c567e1b98a74ec8285af7fbe8b6491 (diff)
downloadmariadb-git-4e1116b2c6e1b6e0714fb2ed742842f1ee6bfab5.tar.gz
MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_NONINL
Also, remove empty .ic files that were not removed by my MySQL commit. Problem: InnoDB used to support a compilation mode that allowed to choose whether the function definitions in .ic files are to be inlined or not. This stopped making sense when InnoDB moved to C++ in MySQL 5.6 (and ha_innodb.cc started to #include .ic files), and more so in MySQL 5.7 when inline methods and functions were introduced in .h files. Solution: Remove all references to UNIV_NONINL and UNIV_MUST_NOT_INLINE from all files, assuming that the symbols are never defined. Remove the files fut0fut.cc and ut0byte.cc which only mattered when UNIV_NONINL was defined.
Diffstat (limited to 'storage/innobase/mem/mem0mem.cc')
-rw-r--r--storage/innobase/mem/mem0mem.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/mem/mem0mem.cc b/storage/innobase/mem/mem0mem.cc
index d067bbaa803..a5b5c9e0f84 100644
--- a/storage/innobase/mem/mem0mem.cc
+++ b/storage/innobase/mem/mem0mem.cc
@@ -27,10 +27,6 @@ Created 6/9/1994 Heikki Tuuri
#include "ha_prototypes.h"
#include "mem0mem.h"
-#ifdef UNIV_NONINL
-#include "mem0mem.ic"
-#endif
-
#include "buf0buf.h"
#include "srv0srv.h"
#include <stdarg.h>