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/pars | |
| 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/pars')
| -rw-r--r-- | storage/innobase/pars/pars0opt.cc | 7 | ||||
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/pars/pars0sym.cc | 7 |
3 files changed, 2 insertions, 17 deletions
diff --git a/storage/innobase/pars/pars0opt.cc b/storage/innobase/pars/pars0opt.cc index a01d535e595..d197332fa3a 100644 --- a/storage/innobase/pars/pars0opt.cc +++ b/storage/innobase/pars/pars0opt.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -24,11 +24,6 @@ Created 12/21/1997 Heikki Tuuri *******************************************************/ #include "pars0opt.h" - -#ifdef UNIV_NONINL -#include "pars0opt.ic" -#endif - #include "row0sel.h" #include "row0ins.h" #include "row0upd.h" diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index f34784b2883..39fd84a2b96 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -29,11 +29,6 @@ on 1/27/1998 */ #include "ha_prototypes.h" #include "pars0pars.h" - -#ifdef UNIV_NONINL -#include "pars0pars.ic" -#endif - #include "row0sel.h" #include "row0ins.h" #include "row0upd.h" diff --git a/storage/innobase/pars/pars0sym.cc b/storage/innobase/pars/pars0sym.cc index b6305368362..ed49500dd94 100644 --- a/storage/innobase/pars/pars0sym.cc +++ b/storage/innobase/pars/pars0sym.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -24,11 +24,6 @@ Created 12/15/1997 Heikki Tuuri *******************************************************/ #include "pars0sym.h" - -#ifdef UNIV_NONINL -#include "pars0sym.ic" -#endif - #include "mem0mem.h" #include "data0type.h" #include "data0data.h" |