diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2016-04-22 10:50:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-17 12:42:07 +0200 |
| commit | 4e1116b2c6e1b6e0714fb2ed742842f1ee6bfab5 (patch) | |
| tree | 7a59a39024510120bfbffad661708fe2887365c9 /storage/innobase/buf | |
| parent | c63ca3d7f0c567e1b98a74ec8285af7fbe8b6491 (diff) | |
| download | mariadb-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/buf')
| -rw-r--r-- | storage/innobase/buf/buf0buddy.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0dblwr.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0flu.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0lru.cc | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/storage/innobase/buf/buf0buddy.cc b/storage/innobase/buf/buf0buddy.cc index 1d6083a5f77..d75fc41376d 100644 --- a/storage/innobase/buf/buf0buddy.cc +++ b/storage/innobase/buf/buf0buddy.cc @@ -24,9 +24,6 @@ Created December 2006 by Marko Makela *******************************************************/ #include "buf0buddy.h" -#ifdef UNIV_NONINL -# include "buf0buddy.ic" -#endif #include "buf0buf.h" #include "buf0lru.h" #include "buf0flu.h" diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index a1827e7b3b5..ebe97581609 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -37,9 +37,6 @@ Created 11/5/1995 Heikki Tuuri #include "buf0buf.h" #include "os0api.h" -#ifdef UNIV_NONINL -#include "buf0buf.ic" -#endif #ifdef UNIV_INNOCHECKSUM #include "string.h" #include "mach0data.h" diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc index 4f83921a553..c4f2280a1f2 100644 --- a/storage/innobase/buf/buf0dblwr.cc +++ b/storage/innobase/buf/buf0dblwr.cc @@ -26,11 +26,6 @@ Created 2011/12/19 #include "ha_prototypes.h" #include "buf0dblwr.h" - -#ifdef UNIV_NONINL -#include "buf0buf.ic" -#endif - #include "buf0buf.h" #include "buf0checksum.h" #include "srv0start.h" diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index ed975702fa3..74e7abd7bac 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/storage/innobase/buf/buf0flu.cc @@ -30,11 +30,6 @@ Created 11/11/1995 Heikki Tuuri #include <my_dbug.h> #include "buf0flu.h" - -#ifdef UNIV_NONINL -#include "buf0flu.ic" -#endif - #include "buf0buf.h" #include "buf0mtflu.h" #include "buf0checksum.h" diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc index 50b2ccc0fcc..de61f776cfa 100644 --- a/storage/innobase/buf/buf0lru.cc +++ b/storage/innobase/buf/buf0lru.cc @@ -24,10 +24,6 @@ Created 11/5/1995 Heikki Tuuri *******************************************************/ #include "buf0lru.h" -#ifdef UNIV_NONINL -#include "buf0lru.ic" -#endif /* UNIV_NOINL */ - #include "ut0byte.h" #include "ut0rnd.h" #include "sync0rw.h" |