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/data | |
| 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/data')
| -rw-r--r-- | storage/innobase/data/data0data.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/data/data0type.cc | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/storage/innobase/data/data0data.cc b/storage/innobase/data/data0data.cc index c897564c1d4..a5e51c9117e 100644 --- a/storage/innobase/data/data0data.cc +++ b/storage/innobase/data/data0data.cc @@ -27,11 +27,6 @@ Created 5/30/1994 Heikki Tuuri #include "ha_prototypes.h" #include "data0data.h" - -#ifdef UNIV_NONINL -#include "data0data.ic" -#endif - #include "rem0rec.h" #include "rem0cmp.h" #include "page0page.h" diff --git a/storage/innobase/data/data0type.cc b/storage/innobase/data/data0type.cc index 7da473f0a3e..3b3c4c212ac 100644 --- a/storage/innobase/data/data0type.cc +++ b/storage/innobase/data/data0type.cc @@ -28,10 +28,6 @@ Created 1/16/1996 Heikki Tuuri #include "data0type.h" -#ifdef UNIV_NONINL -#include "data0type.ic" -#endif - /* At the database startup we store the default-charset collation number of this MySQL installation to this global variable. If we have < 4.1.2 format column definitions, or records in the insert buffer, we use this |