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/include/sync0policy.h | |
| 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/include/sync0policy.h')
| -rw-r--r-- | storage/innobase/include/sync0policy.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/include/sync0policy.h b/storage/innobase/include/sync0policy.h index 1a430328f0e..410e46f9c68 100644 --- a/storage/innobase/include/sync0policy.h +++ b/storage/innobase/include/sync0policy.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2013, 2015, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2013, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under @@ -544,8 +544,6 @@ private: latch_id_t m_id; }; -#ifndef UNIV_NONINL #include "sync0policy.ic" -#endif /* UNIV_NOINL */ #endif /* sync0policy_h */ |