summaryrefslogtreecommitdiff
path: root/storage
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
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')
-rw-r--r--storage/innobase/CMakeLists.txt2
-rw-r--r--storage/innobase/btr/btr0btr.cc4
-rw-r--r--storage/innobase/btr/btr0cur.cc5
-rw-r--r--storage/innobase/btr/btr0pcur.cc7
-rw-r--r--storage/innobase/btr/btr0sea.cc4
-rw-r--r--storage/innobase/buf/buf0buddy.cc3
-rw-r--r--storage/innobase/buf/buf0buf.cc3
-rw-r--r--storage/innobase/buf/buf0dblwr.cc5
-rw-r--r--storage/innobase/buf/buf0flu.cc5
-rw-r--r--storage/innobase/buf/buf0lru.cc4
-rw-r--r--storage/innobase/data/data0data.cc5
-rw-r--r--storage/innobase/data/data0type.cc4
-rw-r--r--storage/innobase/dict/dict0boot.cc7
-rw-r--r--storage/innobase/dict/dict0crea.cc5
-rw-r--r--storage/innobase/dict/dict0defrag_bg.cc4
-rw-r--r--storage/innobase/dict/dict0dict.cc5
-rw-r--r--storage/innobase/dict/dict0load.cc3
-rw-r--r--storage/innobase/dict/dict0mem.cc5
-rw-r--r--storage/innobase/dict/dict0stats_bg.cc4
-rw-r--r--storage/innobase/eval/eval0eval.cc7
-rw-r--r--storage/innobase/eval/eval0proc.cc6
-rw-r--r--storage/innobase/fsp/fsp0fsp.cc5
-rw-r--r--storage/innobase/fts/fts0config.cc7
-rw-r--r--storage/innobase/fts/fts0opt.cc5
-rw-r--r--storage/innobase/fts/fts0que.cc5
-rw-r--r--storage/innobase/fts/fts0sql.cc7
-rw-r--r--storage/innobase/fut/fut0fut.cc31
-rw-r--r--storage/innobase/fut/fut0lst.cc8
-rw-r--r--storage/innobase/ha/ha0ha.cc5
-rw-r--r--storage/innobase/ha/ha0storage.cc6
-rw-r--r--storage/innobase/ha/hash0hash.cc7
-rw-r--r--storage/innobase/ibuf/ibuf0ibuf.cc4
-rw-r--r--storage/innobase/include/btr0btr.h2
-rw-r--r--storage/innobase/include/btr0cur.h2
-rw-r--r--storage/innobase/include/btr0pcur.h2
-rw-r--r--storage/innobase/include/btr0sea.h2
-rw-r--r--storage/innobase/include/buf0buddy.h4
-rw-r--r--storage/innobase/include/buf0buf.h3
-rw-r--r--storage/innobase/include/buf0flu.h2
-rw-r--r--storage/innobase/include/buf0lru.h5
-rw-r--r--storage/innobase/include/buf0lru.ic25
-rw-r--r--storage/innobase/include/data0data.h2
-rw-r--r--storage/innobase/include/data0type.h4
-rw-r--r--storage/innobase/include/dict0boot.h2
-rw-r--r--storage/innobase/include/dict0crea.h2
-rw-r--r--storage/innobase/include/dict0dict.h2
-rw-r--r--storage/innobase/include/dict0load.h4
-rw-r--r--storage/innobase/include/dict0load.ic26
-rw-r--r--storage/innobase/include/dict0mem.h2
-rw-r--r--storage/innobase/include/dict0pagecompress.h2
-rw-r--r--storage/innobase/include/dict0priv.h4
-rw-r--r--storage/innobase/include/dict0stats.h2
-rw-r--r--storage/innobase/include/dict0stats_bg.h18
-rw-r--r--storage/innobase/include/dict0stats_bg.ic45
-rw-r--r--storage/innobase/include/eval0eval.h4
-rw-r--r--storage/innobase/include/eval0proc.h5
-rw-r--r--storage/innobase/include/fil0crypt.h2
-rw-r--r--storage/innobase/include/fil0fil.h7
-rw-r--r--storage/innobase/include/fsp0fsp.h2
-rw-r--r--storage/innobase/include/fsp0pagecompress.h2
-rw-r--r--storage/innobase/include/fts0priv.h2
-rw-r--r--storage/innobase/include/fts0types.h2
-rw-r--r--storage/innobase/include/fut0fut.h2
-rw-r--r--storage/innobase/include/fut0lst.h2
-rw-r--r--storage/innobase/include/gis0rtree.h2
-rw-r--r--storage/innobase/include/ha0ha.h5
-rw-r--r--storage/innobase/include/ha0storage.h4
-rw-r--r--storage/innobase/include/hash0hash.h4
-rw-r--r--storage/innobase/include/ibuf0ibuf.h2
-rw-r--r--storage/innobase/include/lock0lock.h2
-rw-r--r--storage/innobase/include/lock0priv.h2
-rw-r--r--storage/innobase/include/log0log.h2
-rw-r--r--storage/innobase/include/mach0data.h2
-rw-r--r--storage/innobase/include/mem0mem.h2
-rw-r--r--storage/innobase/include/mtr0log.h2
-rw-r--r--storage/innobase/include/mtr0mtr.h2
-rw-r--r--storage/innobase/include/os0file.h2
-rw-r--r--storage/innobase/include/os0proc.h7
-rw-r--r--storage/innobase/include/os0proc.ic27
-rw-r--r--storage/innobase/include/os0thread.h5
-rw-r--r--storage/innobase/include/os0thread.ic25
-rw-r--r--storage/innobase/include/page0cur.h2
-rw-r--r--storage/innobase/include/page0page.h2
-rw-r--r--storage/innobase/include/page0zip.h4
-rw-r--r--storage/innobase/include/pars0opt.h7
-rw-r--r--storage/innobase/include/pars0opt.ic24
-rw-r--r--storage/innobase/include/pars0pars.h5
-rw-r--r--storage/innobase/include/pars0pars.ic24
-rw-r--r--storage/innobase/include/pars0sym.h7
-rw-r--r--storage/innobase/include/pars0sym.ic24
-rw-r--r--storage/innobase/include/que0que.h4
-rw-r--r--storage/innobase/include/rem0cmp.h2
-rw-r--r--storage/innobase/include/rem0rec.h2
-rw-r--r--storage/innobase/include/row0ext.h4
-rw-r--r--storage/innobase/include/row0import.h4
-rw-r--r--storage/innobase/include/row0import.ic25
-rw-r--r--storage/innobase/include/row0ins.h4
-rw-r--r--storage/innobase/include/row0ins.ic26
-rw-r--r--storage/innobase/include/row0log.h2
-rw-r--r--storage/innobase/include/row0mysql.h4
-rw-r--r--storage/innobase/include/row0mysql.ic24
-rw-r--r--storage/innobase/include/row0purge.h5
-rw-r--r--storage/innobase/include/row0purge.ic25
-rw-r--r--storage/innobase/include/row0quiesce.h5
-rw-r--r--storage/innobase/include/row0quiesce.ic26
-rw-r--r--storage/innobase/include/row0row.h2
-rw-r--r--storage/innobase/include/row0sel.h2
-rw-r--r--storage/innobase/include/row0uins.h4
-rw-r--r--storage/innobase/include/row0uins.ic25
-rw-r--r--storage/innobase/include/row0umod.h5
-rw-r--r--storage/innobase/include/row0umod.ic24
-rw-r--r--storage/innobase/include/row0undo.h6
-rw-r--r--storage/innobase/include/row0undo.ic24
-rw-r--r--storage/innobase/include/row0upd.h2
-rw-r--r--storage/innobase/include/row0vers.h7
-rw-r--r--storage/innobase/include/row0vers.ic30
-rw-r--r--storage/innobase/include/srv0mon.h2
-rw-r--r--storage/innobase/include/srv0srv.ic24
-rw-r--r--storage/innobase/include/sync0arr.h4
-rw-r--r--storage/innobase/include/sync0policy.h4
-rw-r--r--storage/innobase/include/sync0rw.h2
-rw-r--r--storage/innobase/include/trx0purge.h4
-rw-r--r--storage/innobase/include/trx0rec.h2
-rw-r--r--storage/innobase/include/trx0roll.h2
-rw-r--r--storage/innobase/include/trx0rseg.h4
-rw-r--r--storage/innobase/include/trx0sys.h2
-rw-r--r--storage/innobase/include/trx0trx.h2
-rw-r--r--storage/innobase/include/trx0undo.h2
-rw-r--r--storage/innobase/include/univ.i12
-rw-r--r--storage/innobase/include/usr0sess.h7
-rw-r--r--storage/innobase/include/usr0sess.ic24
-rw-r--r--storage/innobase/include/ut0byte.h2
-rw-r--r--storage/innobase/include/ut0list.h4
-rw-r--r--storage/innobase/include/ut0mem.h4
-rw-r--r--storage/innobase/include/ut0rnd.h3
-rw-r--r--storage/innobase/include/ut0timer.h2
-rw-r--r--storage/innobase/include/ut0ut.h2
-rw-r--r--storage/innobase/include/ut0vec.h4
-rw-r--r--storage/innobase/lock/lock0lock.cc6
-rw-r--r--storage/innobase/lock/lock0prdt.cc7
-rw-r--r--storage/innobase/log/log0log.cc5
-rw-r--r--storage/innobase/mach/mach0data.cc6
-rw-r--r--storage/innobase/mem/mem0mem.cc4
-rw-r--r--storage/innobase/mtr/mtr0log.cc5
-rw-r--r--storage/innobase/mtr/mtr0mtr.cc4
-rw-r--r--storage/innobase/os/os0file.cc4
-rw-r--r--storage/innobase/os/os0proc.cc6
-rw-r--r--storage/innobase/os/os0thread.cc5
-rw-r--r--storage/innobase/page/page0cur.cc6
-rw-r--r--storage/innobase/page/page0page.cc4
-rw-r--r--storage/innobase/page/page0zip.cc3
-rw-r--r--storage/innobase/pars/pars0opt.cc7
-rw-r--r--storage/innobase/pars/pars0pars.cc5
-rw-r--r--storage/innobase/pars/pars0sym.cc7
-rw-r--r--storage/innobase/que/que0que.cc5
-rw-r--r--storage/innobase/rem/rem0cmp.cc5
-rw-r--r--storage/innobase/rem/rem0rec.cc5
-rw-r--r--storage/innobase/row/row0ext.cc7
-rw-r--r--storage/innobase/row/row0import.cc5
-rw-r--r--storage/innobase/row/row0ins.cc5
-rw-r--r--storage/innobase/row/row0log.cc5
-rw-r--r--storage/innobase/row/row0mysql.cc5
-rw-r--r--storage/innobase/row/row0purge.cc5
-rw-r--r--storage/innobase/row/row0quiesce.cc4
-rw-r--r--storage/innobase/row/row0row.cc5
-rw-r--r--storage/innobase/row/row0sel.cc5
-rw-r--r--storage/innobase/row/row0uins.cc5
-rw-r--r--storage/innobase/row/row0umod.cc5
-rw-r--r--storage/innobase/row/row0undo.cc5
-rw-r--r--storage/innobase/row/row0upd.cc5
-rw-r--r--storage/innobase/row/row0vers.cc5
-rw-r--r--storage/innobase/srv/srv0mon.cc3
-rw-r--r--storage/innobase/sync/sync0arr.cc6
-rw-r--r--storage/innobase/sync/sync0rw.cc5
-rw-r--r--storage/innobase/trx/trx0purge.cc5
-rw-r--r--storage/innobase/trx/trx0rec.cc5
-rw-r--r--storage/innobase/trx/trx0roll.cc4
-rw-r--r--storage/innobase/trx/trx0rseg.cc7
-rw-r--r--storage/innobase/trx/trx0sys.cc5
-rw-r--r--storage/innobase/trx/trx0trx.cc4
-rw-r--r--storage/innobase/trx/trx0undo.cc5
-rw-r--r--storage/innobase/usr/usr0sess.cc7
-rw-r--r--storage/innobase/ut/ut0byte.cc30
-rw-r--r--storage/innobase/ut/ut0list.cc5
-rw-r--r--storage/innobase/ut/ut0mem.cc7
-rw-r--r--storage/innobase/ut/ut0rnd.cc4
-rw-r--r--storage/innobase/ut/ut0ut.cc3
-rw-r--r--storage/innobase/ut/ut0vec.cc5
188 files changed, 72 insertions, 1194 deletions
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 64daf36ffd6..80d84819f08 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -71,7 +71,6 @@ SET(INNOBASE_SOURCES
fsp/fsp0file.cc
fsp/fsp0space.cc
fsp/fsp0sysspace.cc
- fut/fut0fut.cc
fut/fut0lst.cc
ha/ha0ha.cc
ha/ha0storage.cc
@@ -155,7 +154,6 @@ SET(INNOBASE_SOURCES
trx/trx0trx.cc
trx/trx0undo.cc
usr/usr0sess.cc
- ut/ut0byte.cc
ut/ut0crc32.cc
ut/ut0dbg.cc
ut/ut0list.cc
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc
index 49ac63cff6d..29ed2d1a2ce 100644
--- a/storage/innobase/btr/btr0btr.cc
+++ b/storage/innobase/btr/btr0btr.cc
@@ -28,10 +28,6 @@ Created 6/2/1994 Heikki Tuuri
#include "btr0btr.h"
#include "ha_prototypes.h"
-#ifdef UNIV_NONINL
-#include "btr0btr.ic"
-#endif
-
#include "fsp0sysspace.h"
#include "page0page.h"
#include "page0zip.h"
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc
index 06b5b66c2aa..7d93c495aa0 100644
--- a/storage/innobase/btr/btr0cur.cc
+++ b/storage/innobase/btr/btr0cur.cc
@@ -44,11 +44,6 @@ Created 10/16/1994 Heikki Tuuri
*******************************************************/
#include "btr0cur.h"
-
-#ifdef UNIV_NONINL
-#include "btr0cur.ic"
-#endif
-
#include "row0upd.h"
#include "mtr0log.h"
#include "page0page.h"
diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc
index 741f16e0df4..8b0c4f7080a 100644
--- a/storage/innobase/btr/btr0pcur.cc
+++ b/storage/innobase/btr/btr0pcur.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2016, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
@@ -25,11 +25,6 @@ Created 2/23/1996 Heikki Tuuri
*******************************************************/
#include "btr0pcur.h"
-
-#ifdef UNIV_NONINL
-#include "btr0pcur.ic"
-#endif
-
#include "ut0byte.h"
#include "rem0cmp.h"
#include "trx0trx.h"
diff --git a/storage/innobase/btr/btr0sea.cc b/storage/innobase/btr/btr0sea.cc
index 720b84aceef..f7a430591ac 100644
--- a/storage/innobase/btr/btr0sea.cc
+++ b/storage/innobase/btr/btr0sea.cc
@@ -33,10 +33,6 @@ Created 2/17/1996 Heikki Tuuri
#include "btr0sea.h"
#ifdef BTR_CUR_HASH_ADAPT
-#ifdef UNIV_NONINL
-#include "btr0sea.ic"
-#endif /* UNIV_NOINL */
-
#include "buf0buf.h"
#include "page0page.h"
#include "page0cur.h"
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"
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
diff --git a/storage/innobase/dict/dict0boot.cc b/storage/innobase/dict/dict0boot.cc
index 5c4e2049723..8d5bde4e0e2 100644
--- a/storage/innobase/dict/dict0boot.cc
+++ b/storage/innobase/dict/dict0boot.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2016, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
@@ -27,11 +27,6 @@ Created 4/18/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "dict0boot.h"
-
-#ifdef UNIV_NONINL
-#include "dict0boot.ic"
-#endif
-
#include "dict0crea.h"
#include "btr0btr.h"
#include "dict0load.h"
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc
index 340048dbfe3..90dba680f25 100644
--- a/storage/innobase/dict/dict0crea.cc
+++ b/storage/innobase/dict/dict0crea.cc
@@ -26,11 +26,6 @@ Created 1/8/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "dict0crea.h"
-
-#ifdef UNIV_NONINL
-#include "dict0crea.ic"
-#endif
-
#include "btr0pcur.h"
#include "btr0btr.h"
#include "page0page.h"
diff --git a/storage/innobase/dict/dict0defrag_bg.cc b/storage/innobase/dict/dict0defrag_bg.cc
index 3f3eefc6acf..016b774217f 100644
--- a/storage/innobase/dict/dict0defrag_bg.cc
+++ b/storage/innobase/dict/dict0defrag_bg.cc
@@ -31,10 +31,6 @@ Created 25/08/2016 Jan Lindström
#include "srv0start.h"
#include "ut0new.h"
-#ifdef UNIV_NONINL
-# include "dict0stats_bg.ic"
-#endif
-
#include <vector>
static ib_mutex_t defrag_pool_mutex;
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
index 32c1a12ec1e..e7a528ceb28 100644
--- a/storage/innobase/dict/dict0dict.cc
+++ b/storage/innobase/dict/dict0dict.cc
@@ -37,11 +37,6 @@ Created 1/8/1996 Heikki Tuuri
#include "fil0fil.h"
#include <algorithm>
-#ifdef UNIV_NONINL
-#include "dict0dict.ic"
-#include "dict0priv.ic"
-#endif
-
/** dummy index for ROW_FORMAT=REDUNDANT supremum and infimum records */
dict_index_t* dict_ind_redundant;
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index 203185d55a5..1e8bc692049 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -28,9 +28,6 @@ Created 4/24/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "dict0load.h"
-#ifdef UNIV_NONINL
-#include "dict0load.ic"
-#endif
#include "mysql_version.h"
#include "btr0pcur.h"
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc
index f4dbbf026aa..13db213259c 100644
--- a/storage/innobase/dict/dict0mem.cc
+++ b/storage/innobase/dict/dict0mem.cc
@@ -29,11 +29,6 @@ Created 1/8/1996 Heikki Tuuri
#include <mysql_com.h>
#include "dict0mem.h"
-
-#ifdef UNIV_NONINL
-#include "dict0mem.ic"
-#endif
-
#include "rem0rec.h"
#include "data0type.h"
#include "mach0data.h"
diff --git a/storage/innobase/dict/dict0stats_bg.cc b/storage/innobase/dict/dict0stats_bg.cc
index 974ec9b5c41..1c998eb6ff4 100644
--- a/storage/innobase/dict/dict0stats_bg.cc
+++ b/storage/innobase/dict/dict0stats_bg.cc
@@ -32,10 +32,6 @@ Created Apr 25, 2012 Vasil Dimov
#include "srv0start.h"
#include "ut0new.h"
-#ifdef UNIV_NONINL
-# include "dict0stats_bg.ic"
-#endif
-
#include <vector>
/** Minimum time interval between stats recalc for a given table */
diff --git a/storage/innobase/eval/eval0eval.cc b/storage/innobase/eval/eval0eval.cc
index a525cb604ea..fa0b265b3db 100644
--- a/storage/innobase/eval/eval0eval.cc
+++ b/storage/innobase/eval/eval0eval.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
@@ -25,11 +25,6 @@ Created 12/29/1997 Heikki Tuuri
*******************************************************/
#include "eval0eval.h"
-
-#ifdef UNIV_NONINL
-#include "eval0eval.ic"
-#endif
-
#include "data0data.h"
#include "row0sel.h"
#include "rem0cmp.h"
diff --git a/storage/innobase/eval/eval0proc.cc b/storage/innobase/eval/eval0proc.cc
index cdd6fdc2a0a..c73bc6784a6 100644
--- a/storage/innobase/eval/eval0proc.cc
+++ b/storage/innobase/eval/eval0proc.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1998, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1998, 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
@@ -25,10 +25,6 @@ Created 1/20/1998 Heikki Tuuri
#include "eval0proc.h"
-#ifdef UNIV_NONINL
-#include "eval0proc.ic"
-#endif
-
/**********************************************************************//**
Performs an execution step of an if-statement node.
@return query thread to run next or NULL */
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
index 80a2aa211db..8aa1c393e6f 100644
--- a/storage/innobase/fsp/fsp0fsp.cc
+++ b/storage/innobase/fsp/fsp0fsp.cc
@@ -27,11 +27,6 @@ Created 11/29/1995 Heikki Tuuri
#include "ha_prototypes.h"
#include "fsp0fsp.h"
-
-#ifdef UNIV_NONINL
-#include "fsp0fsp.ic"
-#endif
-
#include "buf0buf.h"
#include "fil0fil.h"
#include "fil0crypt.h"
diff --git a/storage/innobase/fts/fts0config.cc b/storage/innobase/fts/fts0config.cc
index 740ee87fe01..928717869ba 100644
--- a/storage/innobase/fts/fts0config.cc
+++ b/storage/innobase/fts/fts0config.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 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
@@ -28,11 +28,6 @@ Created 2007/5/9 Sunny Bains
#include "fts0priv.h"
-#ifdef UNIV_NONINL
-#include "fts0types.ic"
-#include "fts0vlc.ic"
-#endif
-
/******************************************************************//**
Callback function for fetching the config value.
@return always returns TRUE */
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc
index 45c71f6f1cd..9d1b55eb224 100644
--- a/storage/innobase/fts/fts0opt.cc
+++ b/storage/innobase/fts/fts0opt.cc
@@ -38,11 +38,6 @@ Completed 2011/7/10 Sunny and Jimmy Yang
#include "ut0list.h"
#include "zlib.h"
-#ifdef UNIV_NONINL
-#include "fts0types.ic"
-#include "fts0vlc.ic"
-#endif
-
/** The FTS optimize thread's work queue. */
static ib_wqueue_t* fts_optimize_wq;
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc
index dee7c59a58b..c1aa5d43930 100644
--- a/storage/innobase/fts/fts0que.cc
+++ b/storage/innobase/fts/fts0que.cc
@@ -37,11 +37,6 @@ Completed 2011/7/10 Sunny and Jimmy Yang
#include "fts0plugin.h"
#include "ut0new.h"
-#ifdef UNIV_NONINL
-#include "fts0types.ic"
-#include "fts0vlc.ic"
-#endif
-
#include <iomanip>
#include <vector>
diff --git a/storage/innobase/fts/fts0sql.cc b/storage/innobase/fts/fts0sql.cc
index 4900ff3be1a..ae2186c2d30 100644
--- a/storage/innobase/fts/fts0sql.cc
+++ b/storage/innobase/fts/fts0sql.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 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
@@ -30,11 +30,6 @@ Created 2007-03-27 Sunny Bains
#include "fts0types.h"
#include "fts0priv.h"
-#ifdef UNIV_NONINL
-#include "fts0types.ic"
-#include "fts0vlc.ic"
-#endif
-
/** SQL statements for creating the ancillary FTS tables. */
/** Preamble to all SQL statements. */
diff --git a/storage/innobase/fut/fut0fut.cc b/storage/innobase/fut/fut0fut.cc
deleted file mode 100644
index 9bb1c512182..00000000000
--- a/storage/innobase/fut/fut0fut.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1995, 2011, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/******************************************************************//**
-@file fut/fut0fut.cc
-File-based utilities
-
-Created 12/13/1995 Heikki Tuuri
-***********************************************************************/
-
-#include "fut0fut.h"
-
-#ifdef UNIV_NONINL
-#include "fut0fut.ic"
-#endif
-
diff --git a/storage/innobase/fut/fut0lst.cc b/storage/innobase/fut/fut0lst.cc
index 2300d189407..7f2f4d0332d 100644
--- a/storage/innobase/fut/fut0lst.cc
+++ b/storage/innobase/fut/fut0lst.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 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
@@ -23,13 +23,7 @@ File-based list utilities
Created 11/28/1995 Heikki Tuuri
***********************************************************************/
-#include "univ.i"
#include "fut0lst.h"
-
-#ifdef UNIV_NONINL
-#include "fut0lst.ic"
-#endif
-
#include "buf0buf.h"
#include "page0page.h"
diff --git a/storage/innobase/ha/ha0ha.cc b/storage/innobase/ha/ha0ha.cc
index 1f90738c75f..5822bd6755c 100644
--- a/storage/innobase/ha/ha0ha.cc
+++ b/storage/innobase/ha/ha0ha.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 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,9 +24,6 @@ Created 8/22/1994 Heikki Tuuri
*************************************************************************/
#include "ha0ha.h"
-#ifdef UNIV_NONINL
-#include "ha0ha.ic"
-#endif
#ifdef UNIV_DEBUG
# include "buf0buf.h"
diff --git a/storage/innobase/ha/ha0storage.cc b/storage/innobase/ha/ha0storage.cc
index a36fd573a4f..cde4cc04cb7 100644
--- a/storage/innobase/ha/ha0storage.cc
+++ b/storage/innobase/ha/ha0storage.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 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
@@ -31,10 +31,6 @@ Created September 22, 2007 Vasil Dimov
#include "mem0mem.h"
#include "ut0rnd.h"
-#ifdef UNIV_NONINL
-#include "ha0storage.ic"
-#endif
-
/*******************************************************************//**
Retrieves a data from a storage. If it is present, a pointer to the
stored copy of data is returned, otherwise NULL is returned. */
diff --git a/storage/innobase/ha/hash0hash.cc b/storage/innobase/ha/hash0hash.cc
index ef1339ff47b..6b36fb1d3fa 100644
--- a/storage/innobase/ha/hash0hash.cc
+++ b/storage/innobase/ha/hash0hash.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1997, 2015, 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 5/20/1997 Heikki Tuuri
*******************************************************/
#include "hash0hash.h"
-
-#ifdef UNIV_NONINL
-#include "hash0hash.ic"
-#endif /* UNIV_NOINL */
-
#include "mem0mem.h"
#include "sync0sync.h"
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc
index 3bc56c2d737..7dee46dc4a9 100644
--- a/storage/innobase/ibuf/ibuf0ibuf.cc
+++ b/storage/innobase/ibuf/ibuf0ibuf.cc
@@ -42,10 +42,6 @@ my_bool srv_ibuf_disable_background_merge;
/** The start address for an insert buffer bitmap page bitmap */
#define IBUF_BITMAP PAGE_DATA
-#ifdef UNIV_NONINL
-#include "ibuf0ibuf.ic"
-#endif
-
#include "buf0buf.h"
#include "buf0rea.h"
#include "fsp0fsp.h"
diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h
index 3e9c639f602..a5409c3ad4c 100644
--- a/storage/innobase/include/btr0btr.h
+++ b/storage/innobase/include/btr0btr.h
@@ -823,9 +823,7 @@ btr_lift_page_up(
#define BTR_N_LEAF_PAGES 1
#define BTR_TOTAL_SIZE 2
-#ifndef UNIV_NONINL
#include "btr0btr.ic"
-#endif
/****************************************************************
Global variable controlling if scrubbing should be performed */
diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h
index 19109e30b13..fee7f375cb4 100644
--- a/storage/innobase/include/btr0cur.h
+++ b/storage/innobase/include/btr0cur.h
@@ -997,8 +997,6 @@ extern ulint btr_cur_n_sea_old;
extern uint btr_cur_limit_optimistic_insert_debug;
#endif /* UNIV_DEBUG */
-#ifndef UNIV_NONINL
#include "btr0cur.ic"
-#endif
#endif
diff --git a/storage/innobase/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h
index 28636715c2b..21a5eea8c01 100644
--- a/storage/innobase/include/btr0pcur.h
+++ b/storage/innobase/include/btr0pcur.h
@@ -548,8 +548,6 @@ struct btr_pcur_t{
dict_index_t* index() const { return(btr_cur.index); }
};
-#ifndef UNIV_NONINL
#include "btr0pcur.ic"
-#endif
#endif
diff --git a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h
index 8ff411cffd0..8887a3f81ad 100644
--- a/storage/innobase/include/btr0sea.h
+++ b/storage/innobase/include/btr0sea.h
@@ -373,8 +373,6 @@ again set this much timeout. This is to reduce contention. */
#define BTR_SEA_TIMEOUT 10000
#endif /* BTR_CUR_HASH_ADAPT */
-#ifndef UNIV_NONINL
#include "btr0sea.ic"
-#endif
#endif
diff --git a/storage/innobase/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h
index c2c100e83e6..f56ac2e5e70 100644
--- a/storage/innobase/include/buf0buddy.h
+++ b/storage/innobase/include/buf0buddy.h
@@ -88,8 +88,6 @@ void
buf_buddy_condense_free(
buf_pool_t* buf_pool);
-#ifndef UNIV_NONINL
-# include "buf0buddy.ic"
-#endif
+#include "buf0buddy.ic"
#endif /* buf0buddy_h */
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
index ea0dd48cdbd..a4e1e11ad2c 100644
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
@@ -2508,9 +2508,8 @@ struct CheckUnzipLRUAndLRUList {
};
#endif /* UNIV_DEBUG || defined UNIV_BUF_DEBUG */
-#ifndef UNIV_NONINL
#include "buf0buf.ic"
-#endif
+
#endif /* !UNIV_INNOCHECKSUM */
#endif
diff --git a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h
index fd124e8f94e..105a9173c54 100644
--- a/storage/innobase/include/buf0flu.h
+++ b/storage/innobase/include/buf0flu.h
@@ -485,8 +485,6 @@ buf_flush_batch(
counts */
-#ifndef UNIV_NONINL
#include "buf0flu.ic"
-#endif
#endif
diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
index 2ad1211a548..0ee8e5fb475 100644
--- a/storage/innobase/include/buf0lru.h
+++ b/storage/innobase/include/buf0lru.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 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
the terms of the GNU General Public License as published by the Free Software
@@ -287,8 +288,4 @@ Increments the I/O counter in buf_LRU_stat_cur. */
Increments the page_zip_decompress() counter in buf_LRU_stat_cur. */
#define buf_LRU_stat_inc_unzip() buf_LRU_stat_cur.unzip++
-#ifndef UNIV_NONINL
-#include "buf0lru.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/buf0lru.ic b/storage/innobase/include/buf0lru.ic
deleted file mode 100644
index 6e0da7a2588..00000000000
--- a/storage/innobase/include/buf0lru.ic
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1995, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/buf0lru.ic
-The database buffer replacement algorithm
-
-Created 11/5/1995 Heikki Tuuri
-*******************************************************/
-
diff --git a/storage/innobase/include/data0data.h b/storage/innobase/include/data0data.h
index 8385fe3d0d3..7dee214dfe1 100644
--- a/storage/innobase/include/data0data.h
+++ b/storage/innobase/include/data0data.h
@@ -684,8 +684,6 @@ struct big_rec_t {
ulint n_fld);
};
-#ifndef UNIV_NONINL
#include "data0data.ic"
-#endif
#endif
diff --git a/storage/innobase/include/data0type.h b/storage/innobase/include/data0type.h
index 958f5a4d0de..4c6b6cd13e9 100644
--- a/storage/innobase/include/data0type.h
+++ b/storage/innobase/include/data0type.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -576,8 +576,6 @@ struct dtype_t{
mbmaxlen=DATA_MBMINLEN(mbminmaxlen) */
};
-#ifndef UNIV_NONINL
#include "data0type.ic"
-#endif
#endif
diff --git a/storage/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h
index 5884ba4bcc2..d6de7dcf71b 100644
--- a/storage/innobase/include/dict0boot.h
+++ b/storage/innobase/include/dict0boot.h
@@ -353,8 +353,6 @@ two) is assigned, the field DICT_HDR_ROW_ID on the dictionary header page is
updated */
#define DICT_HDR_ROW_ID_WRITE_MARGIN 256
-#ifndef UNIV_NONINL
#include "dict0boot.ic"
-#endif
#endif
diff --git a/storage/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h
index 9065f7ebf3d..f53ea74717d 100644
--- a/storage/innobase/include/dict0crea.h
+++ b/storage/innobase/include/dict0crea.h
@@ -383,8 +383,6 @@ dict_get_v_col_pos(
#define INDEX_CREATE_INDEX_TREE 3
#define INDEX_ADD_TO_CACHE 4
-#ifndef UNIV_NONINL
#include "dict0crea.ic"
-#endif
#endif
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
index 92f00549dc9..602435c0051 100644
--- a/storage/innobase/include/dict0dict.h
+++ b/storage/innobase/include/dict0dict.h
@@ -2063,8 +2063,6 @@ bool
dict_table_have_virtual_index(
dict_table_t* table);
-#ifndef UNIV_NONINL
#include "dict0dict.ic"
-#endif
#endif
diff --git a/storage/innobase/include/dict0load.h b/storage/innobase/include/dict0load.h
index 0a862bb17a9..fffb917f078 100644
--- a/storage/innobase/include/dict0load.h
+++ b/storage/innobase/include/dict0load.h
@@ -430,8 +430,4 @@ dict_replace_tablespace_and_filepath(
const char* filepath,
ulint fsp_flags);
-#ifndef UNIV_NONINL
-#include "dict0load.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/dict0load.ic b/storage/innobase/include/dict0load.ic
deleted file mode 100644
index 2c0f1ff38a5..00000000000
--- a/storage/innobase/include/dict0load.ic
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1996, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/dict0load.ic
-Loads to the memory cache database object definitions
-from dictionary tables
-
-Created 4/24/1996 Heikki Tuuri
-*******************************************************/
-
diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
index 0faaac4d206..0630137bb4f 100644
--- a/storage/innobase/include/dict0mem.h
+++ b/storage/innobase/include/dict0mem.h
@@ -1870,8 +1870,6 @@ dict_col_get_spatial_status(
return(spatial_status);
}
-#ifndef UNIV_NONINL
#include "dict0mem.ic"
-#endif
#endif /* dict0mem_h */
diff --git a/storage/innobase/include/dict0pagecompress.h b/storage/innobase/include/dict0pagecompress.h
index 6641f6ba85f..98f3486cdb9 100644
--- a/storage/innobase/include/dict0pagecompress.h
+++ b/storage/innobase/include/dict0pagecompress.h
@@ -56,8 +56,6 @@ dict_table_page_compression_level(
const dict_table_t* table) /*!< in: table */
__attribute__((const));
-#ifndef UNIV_NONINL
#include "dict0pagecompress.ic"
-#endif
#endif
diff --git a/storage/innobase/include/dict0priv.h b/storage/innobase/include/dict0priv.h
index 35548faeb93..593c27125a2 100644
--- a/storage/innobase/include/dict0priv.h
+++ b/storage/innobase/include/dict0priv.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2010, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2010, 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
@@ -59,8 +59,6 @@ dict_table_open_on_id_low(
when loading the table */
ibool open_only_if_in_cache);
-#ifndef UNIV_NONINL
#include "dict0priv.ic"
-#endif
#endif /* dict0priv.h */
diff --git a/storage/innobase/include/dict0stats.h b/storage/innobase/include/dict0stats.h
index cb16a4dee9c..ded60d1a9eb 100644
--- a/storage/innobase/include/dict0stats.h
+++ b/storage/innobase/include/dict0stats.h
@@ -263,9 +263,7 @@ dict_stats_save_index_stat(
const char* stat_description,
trx_t* trx);
-#ifndef UNIV_NONINL
#include "dict0stats.ic"
-#endif
#ifdef UNIV_ENABLE_UNIT_TEST_DICT_STATS
void test_dict_stats_all();
diff --git a/storage/innobase/include/dict0stats_bg.h b/storage/innobase/include/dict0stats_bg.h
index e09716e3842..b7bf1b0c170 100644
--- a/storage/innobase/include/dict0stats_bg.h
+++ b/storage/innobase/include/dict0stats_bg.h
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, MariaDB Corporation. All Rights Reserved.
+Copyright (c) 2017, MariaDB Corporation.
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
@@ -83,7 +83,17 @@ bool
dict_stats_stop_bg(
/*===============*/
dict_table_t* table) /*!< in/out: table */
- MY_ATTRIBUTE((warn_unused_result));
+{
+ ut_ad(!srv_read_only_mode);
+ ut_ad(mutex_own(&dict_sys->mutex));
+
+ if (!(table->stats_bg_flag & BG_STAT_IN_PROGRESS)) {
+ return(true);
+ }
+
+ table->stats_bg_flag |= BG_STAT_SHOULD_QUIT;
+ return(false);
+}
/*****************************************************************//**
Wait until background stats thread has stopped using the specified table.
@@ -145,8 +155,4 @@ DECLARE_THREAD(dict_stats_thread)(
void
dict_stats_shutdown();
-# ifndef UNIV_NONINL
-# include "dict0stats_bg.ic"
-# endif
-
#endif /* dict0stats_bg_h */
diff --git a/storage/innobase/include/dict0stats_bg.ic b/storage/innobase/include/dict0stats_bg.ic
deleted file mode 100644
index 87e3225de58..00000000000
--- a/storage/innobase/include/dict0stats_bg.ic
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2012, 2013, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/dict0stats_bg.ic
-Code used for background table and index stats gathering.
-
-Created Feb 8, 2013 Marko Makela
-*******************************************************/
-
-/*****************************************************************//**
-Request the background collection of statistics to stop for a table.
-@retval true when no background process is active
-@retval false when it is not safe to modify the table definition */
-UNIV_INLINE
-bool
-dict_stats_stop_bg(
-/*===============*/
- dict_table_t* table) /*!< in/out: table */
-{
- ut_ad(!srv_read_only_mode);
- ut_ad(mutex_own(&dict_sys->mutex));
-
- if (!(table->stats_bg_flag & BG_STAT_IN_PROGRESS)) {
- return(true);
- }
-
- table->stats_bg_flag |= BG_STAT_SHOULD_QUIT;
- return(false);
-}
diff --git a/storage/innobase/include/eval0eval.h b/storage/innobase/include/eval0eval.h
index f0e5b4006b6..2e20c634c3b 100644
--- a/storage/innobase/include/eval0eval.h
+++ b/storage/innobase/include/eval0eval.h
@@ -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
@@ -105,8 +105,6 @@ eval_cmp(
func_node_t* cmp_node); /*!< in: comparison node */
-#ifndef UNIV_NONINL
#include "eval0eval.ic"
-#endif
#endif
diff --git a/storage/innobase/include/eval0proc.h b/storage/innobase/include/eval0proc.h
index 6705c2c7b64..b359bf06ce0 100644
--- a/storage/innobase/include/eval0proc.h
+++ b/storage/innobase/include/eval0proc.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1998, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1998, 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
@@ -90,9 +90,6 @@ return_step(
/*========*/
que_thr_t* thr); /*!< in: query thread */
-
-#ifndef UNIV_NONINL
#include "eval0proc.ic"
-#endif
#endif
diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h
index 7211d295c27..d6a6ecb1538 100644
--- a/storage/innobase/include/fil0crypt.h
+++ b/storage/innobase/include/fil0crypt.h
@@ -533,8 +533,6 @@ fil_crypt_calculate_checksum(
byte* dst_frame) /*!< in: page where to calculate */
__attribute__((warn_unused_result));
-#ifndef UNIV_NONINL
#include "fil0crypt.ic"
-#endif
#endif /* fil0crypt_h */
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index 587ad902c2a..66d79bd24b5 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -1591,12 +1591,7 @@ fil_decr_pending_ops(
/*=================*/
ulint id); /*!< in: space id */
-#endif /* UNIV_INNOCHECKSUM */
-
-#ifndef UNIV_INNOCHECKSUM
-#ifndef UNIV_NONINL
#include "fil0fil.ic"
-#endif
-#endif
+#endif /* UNIV_INNOCHECKSUM */
#endif /* fil0fil_h */
diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h
index 621498b9a4c..2c1b38d597e 100644
--- a/storage/innobase/include/fsp0fsp.h
+++ b/storage/innobase/include/fsp0fsp.h
@@ -869,8 +869,6 @@ fsp_page_is_free_func(
#endif /* UNIV_INNOCHECKSUM */
-#ifndef UNIV_NONINL
#include "fsp0fsp.ic"
-#endif
#endif
diff --git a/storage/innobase/include/fsp0pagecompress.h b/storage/innobase/include/fsp0pagecompress.h
index b45a4b87890..a5c76737b3a 100644
--- a/storage/innobase/include/fsp0pagecompress.h
+++ b/storage/innobase/include/fsp0pagecompress.h
@@ -59,8 +59,6 @@ fsp_flags_get_page_compression_level(
/*=================================*/
ulint flags); /*!< in: tablespace flags */
-#ifndef UNIV_NONINL
#include "fsp0pagecompress.ic"
-#endif
#endif
diff --git a/storage/innobase/include/fts0priv.h b/storage/innobase/include/fts0priv.h
index 1fd33c2b103..30801692569 100644
--- a/storage/innobase/include/fts0priv.h
+++ b/storage/innobase/include/fts0priv.h
@@ -639,8 +639,6 @@ fts_config_create_index_param_name(
const dict_index_t* index) /*!< in: index for config */
MY_ATTRIBUTE((warn_unused_result));
-#ifndef UNIV_NONINL
#include "fts0priv.ic"
-#endif
#endif /* INNOBASE_FTS0PRIV_H */
diff --git a/storage/innobase/include/fts0types.h b/storage/innobase/include/fts0types.h
index 5c6cd3ee56d..c1db160602f 100644
--- a/storage/innobase/include/fts0types.h
+++ b/storage/innobase/include/fts0types.h
@@ -399,9 +399,7 @@ fts_select_index(
const byte* str,
ulint len);
-#ifndef UNIV_NONINL
#include "fts0types.ic"
#include "fts0vlc.ic"
-#endif
#endif /* INNOBASE_FTS0TYPES_H */
diff --git a/storage/innobase/include/fut0fut.h b/storage/innobase/include/fut0fut.h
index 0b8b8b0e43b..82882444291 100644
--- a/storage/innobase/include/fut0fut.h
+++ b/storage/innobase/include/fut0fut.h
@@ -52,8 +52,6 @@ fut_get_ptr(
buf_block_t** ptr_block = NULL)
MY_ATTRIBUTE((warn_unused_result));
-#ifndef UNIV_NONINL
#include "fut0fut.ic"
-#endif
#endif /* fut0fut_h */
diff --git a/storage/innobase/include/fut0lst.h b/storage/innobase/include/fut0lst.h
index 450def96227..56f886bf614 100644
--- a/storage/innobase/include/fut0lst.h
+++ b/storage/innobase/include/fut0lst.h
@@ -177,9 +177,7 @@ flst_print(
mtr_t* mtr); /*!< in: mtr */
-#ifndef UNIV_NONINL
#include "fut0lst.ic"
-#endif
#endif /* !UNIV_INNOCHECKSUM */
diff --git a/storage/innobase/include/gis0rtree.h b/storage/innobase/include/gis0rtree.h
index 950e2f2e9f5..37faa4eb903 100644
--- a/storage/innobase/include/gis0rtree.h
+++ b/storage/innobase/include/gis0rtree.h
@@ -584,7 +584,5 @@ rtr_estimate_n_rows_in_range(
const dtuple_t* tuple,
page_cur_mode_t mode);
-#ifndef UNIV_NONINL
#include "gis0rtree.ic"
-#endif
#endif /*!< gis0rtree.h */
diff --git a/storage/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h
index 7ddcaf82aa8..db53b6c6580 100644
--- a/storage/innobase/include/ha0ha.h
+++ b/storage/innobase/include/ha0ha.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 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
@@ -244,9 +244,6 @@ hash_assert_can_search(
#define hash_assert_can_search(t, f)
#endif /* UNIV_DEBUG */
-
-#ifndef UNIV_NONINL
#include "ha0ha.ic"
-#endif
#endif
diff --git a/storage/innobase/include/ha0storage.h b/storage/innobase/include/ha0storage.h
index 7dd6d26bad0..ccca2206897 100644
--- a/storage/innobase/include/ha0storage.h
+++ b/storage/innobase/include/ha0storage.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2007, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2007, 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
@@ -132,8 +132,6 @@ ha_storage_get_size(
/*================*/
const ha_storage_t* storage); /*!< in: hash storage */
-#ifndef UNIV_NONINL
#include "ha0storage.ic"
-#endif
#endif /* ha0storage_h */
diff --git a/storage/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h
index 738fa813ddd..ab44425f405 100644
--- a/storage/innobase/include/hash0hash.h
+++ b/storage/innobase/include/hash0hash.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1997, 2015, 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
@@ -572,8 +572,6 @@ struct hash_table_t {
#endif /* UNIV_DEBUG */
};
-#ifndef UNIV_NONINL
#include "hash0hash.ic"
-#endif
#endif
diff --git a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h
index ee8272d724c..6cff26635bd 100644
--- a/storage/innobase/include/ibuf0ibuf.h
+++ b/storage/innobase/include/ibuf0ibuf.h
@@ -450,8 +450,6 @@ for the file segment from which the pages for the ibuf tree are allocated */
/* The insert buffer tree itself is always located in space 0. */
#define IBUF_SPACE_ID static_cast<ulint>(0)
-#ifndef UNIV_NONINL
#include "ibuf0ibuf.ic"
-#endif
#endif
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
index b211b24d7ff..579e5adab75 100644
--- a/storage/innobase/include/lock0lock.h
+++ b/storage/innobase/include/lock0lock.h
@@ -1172,8 +1172,6 @@ lock_update_split_and_merge(
#endif /* WITH_WSREP */
-#ifndef UNIV_NONINL
#include "lock0lock.ic"
-#endif
#endif
diff --git a/storage/innobase/include/lock0priv.h b/storage/innobase/include/lock0priv.h
index 0b2ab1bfcfe..6bb75817ad6 100644
--- a/storage/innobase/include/lock0priv.h
+++ b/storage/innobase/include/lock0priv.h
@@ -1170,8 +1170,6 @@ lock_table_has(
const dict_table_t* table, /*!< in: table */
enum lock_mode mode); /*!< in: lock mode */
-#ifndef UNIV_NONINL
#include "lock0priv.ic"
-#endif
#endif /* lock0priv_h */
diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h
index de72e5291ef..6cee1d97b48 100644
--- a/storage/innobase/include/log0log.h
+++ b/storage/innobase/include/log0log.h
@@ -814,8 +814,6 @@ extern os_event_t log_scrub_event;
/** Whether log_scrub_thread is active */
extern bool log_scrub_thread_active;
-#ifndef UNIV_NONINL
#include "log0log.ic"
-#endif
#endif
diff --git a/storage/innobase/include/mach0data.h b/storage/innobase/include/mach0data.h
index d3e3a53c655..5a5574b2537 100644
--- a/storage/innobase/include/mach0data.h
+++ b/storage/innobase/include/mach0data.h
@@ -375,8 +375,6 @@ mach_read_ulint(
#endif /* !UNIV_INNOCHECKSUM */
-#ifndef UNIV_NONINL
#include "mach0data.ic"
-#endif
#endif
diff --git a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h
index c44b6d38b78..e44f3f730af 100644
--- a/storage/innobase/include/mem0mem.h
+++ b/storage/innobase/include/mem0mem.h
@@ -411,9 +411,7 @@ struct mem_block_info_t {
#define MEM_BLOCK_HEADER_SIZE ut_calc_align(sizeof(mem_block_info_t),\
UNIV_MEM_ALIGNMENT)
-#ifndef UNIV_NONINL
#include "mem0mem.ic"
-#endif
/** A C++ wrapper class to the mem_heap_t routines, so that it can be used
as an STL allocator */
diff --git a/storage/innobase/include/mtr0log.h b/storage/innobase/include/mtr0log.h
index b5c94ff7d46..d6b32374c42 100644
--- a/storage/innobase/include/mtr0log.h
+++ b/storage/innobase/include/mtr0log.h
@@ -243,8 +243,6 @@ mlog_parse_index(
extra mlog buffer size for variable size data */
#define MLOG_BUF_MARGIN 256
-#ifndef UNIV_NONINL
#include "mtr0log.ic"
-#endif /* UNIV_NOINL */
#endif /* mtr0log_h */
diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h
index 4e5120e342a..a02333109cc 100644
--- a/storage/innobase/include/mtr0mtr.h
+++ b/storage/innobase/include/mtr0mtr.h
@@ -612,8 +612,6 @@ private:
bool m_sync;
};
-#ifndef UNIV_NONINL
#include "mtr0mtr.ic"
-#endif /* UNIV_NOINL */
#endif /* mtr0mtr_h */
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
index ec42dd3d771..f37e735de4d 100644
--- a/storage/innobase/include/os0file.h
+++ b/storage/innobase/include/os0file.h
@@ -1606,8 +1606,6 @@ os_file_get_block_size(
os_file_t file, /*!< in: handle to a file */
const char* name); /*!< in: file name */
-#ifndef UNIV_NONINL
#include "os0file.ic"
-#endif /* UNIV_NONINL */
#endif /* os0file_h */
diff --git a/storage/innobase/include/os0proc.h b/storage/innobase/include/os0proc.h
index af57b5d6a7a..a73ba5a9e84 100644
--- a/storage/innobase/include/os0proc.h
+++ b/storage/innobase/include/os0proc.h
@@ -1,6 +1,7 @@
/*****************************************************************************
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 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
the terms of the GNU General Public License as published by the Free Software
@@ -67,8 +68,4 @@ os_mem_free_large(
void *ptr,
ulint size);
-#ifndef UNIV_NONINL
-#include "os0proc.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/os0proc.ic b/storage/innobase/include/os0proc.ic
deleted file mode 100644
index 506f4f8ce0c..00000000000
--- a/storage/innobase/include/os0proc.ic
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1995, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/os0proc.ic
-The interface to the operating system
-process control primitives
-
-Created 9/30/1995 Heikki Tuuri
-*******************************************************/
-
-
diff --git a/storage/innobase/include/os0thread.h b/storage/innobase/include/os0thread.h
index 9ba35b6f359..7aea976a37e 100644
--- a/storage/innobase/include/os0thread.h
+++ b/storage/innobase/include/os0thread.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 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
the terms of the GNU General Public License as published by the Free Software
@@ -159,8 +160,4 @@ bool
os_thread_active();
/*==============*/
-#ifndef UNIV_NONINL
-#include "os0thread.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/os0thread.ic b/storage/innobase/include/os0thread.ic
deleted file mode 100644
index 0622d22f2dc..00000000000
--- a/storage/innobase/include/os0thread.ic
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1995, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/os0thread.ic
-The interface to the operating system
-process and thread control primitives
-
-Created 9/8/1995 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/page0cur.h b/storage/innobase/include/page0cur.h
index 731817e740a..f3890c43b73 100644
--- a/storage/innobase/include/page0cur.h
+++ b/storage/innobase/include/page0cur.h
@@ -387,8 +387,6 @@ struct page_cur_t{
buf_block_t* block; /*!< pointer to the block containing rec */
};
-#ifndef UNIV_NONINL
#include "page0cur.ic"
-#endif
#endif
diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h
index e61e7d2ae16..a8c5f11c17b 100644
--- a/storage/innobase/include/page0page.h
+++ b/storage/innobase/include/page0page.h
@@ -1193,9 +1193,7 @@ page_warn_strict_checksum(
#endif /* !UNIV_INNOCHECKSUM */
-#ifndef UNIV_NONINL
#include "page0page.ic"
-#endif
#endif
diff --git a/storage/innobase/include/page0zip.h b/storage/innobase/include/page0zip.h
index f4da2b55385..e1062c00a6f 100644
--- a/storage/innobase/include/page0zip.h
+++ b/storage/innobase/include/page0zip.h
@@ -564,9 +564,7 @@ page_zip_reset_stat_per_index();
# define UNIV_INLINE UNIV_INLINE_ORIGINAL
#endif
-#ifndef UNIV_NONINL
-# include "page0zip.ic"
-#endif
+#include "page0zip.ic"
#endif /* !UNIV_INNOCHECKSUM */
#endif /* page0zip_h */
diff --git a/storage/innobase/include/pars0opt.h b/storage/innobase/include/pars0opt.h
index cb1ce60ac22..13ea38cc385 100644
--- a/storage/innobase/include/pars0opt.h
+++ b/storage/innobase/include/pars0opt.h
@@ -1,6 +1,7 @@
/*****************************************************************************
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 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
the terms of the GNU General Public License as published by the Free Software
@@ -67,8 +68,4 @@ opt_print_query_plan(
sel_node_t* sel_node); /*!< in: select node */
#endif /* UNIV_SQL_DEBUG */
-#ifndef UNIV_NONINL
-#include "pars0opt.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/pars0opt.ic b/storage/innobase/include/pars0opt.ic
deleted file mode 100644
index 786d911ca3d..00000000000
--- a/storage/innobase/include/pars0opt.ic
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1997, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/pars0opt.ic
-Simple SQL optimizer
-
-Created 12/21/1997 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h
index 732eb8b3945..dad7953424c 100644
--- a/storage/innobase/include/pars0pars.h
+++ b/storage/innobase/include/pars0pars.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 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
the terms of the GNU General Public License as published by the Free Software
@@ -753,8 +754,4 @@ struct col_assign_node_t{
e.g., := */
/* @} */
-#ifndef UNIV_NONINL
-#include "pars0pars.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/pars0pars.ic b/storage/innobase/include/pars0pars.ic
deleted file mode 100644
index 4c88337a265..00000000000
--- a/storage/innobase/include/pars0pars.ic
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1996, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/pars0pars.ic
-SQL parser
-
-Created 11/19/1996 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/pars0sym.h b/storage/innobase/include/pars0sym.h
index abd0c5cd4c8..4e511719639 100644
--- a/storage/innobase/include/pars0sym.h
+++ b/storage/innobase/include/pars0sym.h
@@ -1,6 +1,7 @@
/*****************************************************************************
-Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 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
the terms of the GNU General Public License as published by the Free Software
@@ -242,8 +243,4 @@ struct sym_tab_t{
allocate space */
};
-#ifndef UNIV_NONINL
-#include "pars0sym.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/pars0sym.ic b/storage/innobase/include/pars0sym.ic
deleted file mode 100644
index 266c1a6310d..00000000000
--- a/storage/innobase/include/pars0sym.ic
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1997, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/pars0sym.ic
-SQL parser symbol table
-
-Created 12/15/1997 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h
index 574b7e6acee..763b16820d8 100644
--- a/storage/innobase/include/que0que.h
+++ b/storage/innobase/include/que0que.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -499,8 +499,6 @@ struct que_fork_t{
#define QUE_NODE_CALL 31
#define QUE_NODE_EXIT 32
-#ifndef UNIV_NONINL
#include "que0que.ic"
-#endif
#endif
diff --git a/storage/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h
index a59479849a8..245fefae944 100644
--- a/storage/innobase/include/rem0cmp.h
+++ b/storage/innobase/include/rem0cmp.h
@@ -250,8 +250,6 @@ cmp_dfield_dfield_like_prefix(
const dfield_t* dfield1,
const dfield_t* dfield2);
-#ifndef UNIV_NONINL
#include "rem0cmp.ic"
-#endif
#endif
diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h
index 4b82a6b05b9..4ee8b1f1ff1 100644
--- a/storage/innobase/include/rem0rec.h
+++ b/storage/innobase/include/rem0rec.h
@@ -1120,8 +1120,6 @@ int wsrep_rec_get_foreign_key(
ibool new_protocol); /* in: protocol > 1 */
#endif /* WITH_WSREP */
-#ifndef UNIV_NONINL
#include "rem0rec.ic"
-#endif
#endif /* rem0rec_h */
diff --git a/storage/innobase/include/row0ext.h b/storage/innobase/include/row0ext.h
index 1d788a4c217..050bc37850b 100644
--- a/storage/innobase/include/row0ext.h
+++ b/storage/innobase/include/row0ext.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 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
@@ -98,8 +98,6 @@ struct row_ext_t{
ulint len[1]; /*!< prefix lengths; 0 if not cached */
};
-#ifndef UNIV_NONINL
#include "row0ext.ic"
-#endif
#endif
diff --git a/storage/innobase/include/row0import.h b/storage/innobase/include/row0import.h
index 137c28ac1fa..c6dfca9d7e8 100644
--- a/storage/innobase/include/row0import.h
+++ b/storage/innobase/include/row0import.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 2012, 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
the terms of the GNU General Public License as published by the Free Software
@@ -80,8 +81,5 @@ row_import_update_index_root(
caller already owns the
dict_sys_t:: mutex. */
MY_ATTRIBUTE((nonnull, warn_unused_result));
-#ifndef UNIV_NONINL
-#include "row0import.ic"
-#endif
#endif /* row0import_h */
diff --git a/storage/innobase/include/row0import.ic b/storage/innobase/include/row0import.ic
deleted file mode 100644
index c5bbab49f6f..00000000000
--- a/storage/innobase/include/row0import.ic
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2012, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/row0import.ic
-
-Import tablespace inline functions.
-
-Created 2012-02-08 Sunny Bains
-*******************************************************/
diff --git a/storage/innobase/include/row0ins.h b/storage/innobase/include/row0ins.h
index 00a32942de2..423acb7dfeb 100644
--- a/storage/innobase/include/row0ins.h
+++ b/storage/innobase/include/row0ins.h
@@ -253,8 +253,4 @@ struct ins_node_t{
#define INS_NODE_INSERT_ENTRIES 3 /* index entries should be built and
inserted */
-#ifndef UNIV_NONINL
-#include "row0ins.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/row0ins.ic b/storage/innobase/include/row0ins.ic
deleted file mode 100644
index 9c191d869a2..00000000000
--- a/storage/innobase/include/row0ins.ic
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1996, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/row0ins.ic
-Insert into a table
-
-Created 4/20/1996 Heikki Tuuri
-*******************************************************/
-
-
diff --git a/storage/innobase/include/row0log.h b/storage/innobase/include/row0log.h
index c8db44f23b3..980facee427 100644
--- a/storage/innobase/include/row0log.h
+++ b/storage/innobase/include/row0log.h
@@ -259,8 +259,6 @@ row_log_estimate_work(
const dict_index_t* index);
#endif /* HAVE_PSI_STAGE_INTERFACE */
-#ifndef UNIV_NONINL
#include "row0log.ic"
-#endif
#endif /* row0log.h */
diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index 0e4ebafc990..8bb45302122 100644
--- a/storage/innobase/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
@@ -961,10 +961,6 @@ innobase_rename_vc_templ(
#define ROW_READ_TRY_SEMI_CONSISTENT 1
#define ROW_READ_DID_SEMI_CONSISTENT 2
-#ifndef UNIV_NONINL
-#include "row0mysql.ic"
-#endif
-
#ifdef UNIV_DEBUG
/** Wait for the background drop list to become empty. */
void
diff --git a/storage/innobase/include/row0mysql.ic b/storage/innobase/include/row0mysql.ic
deleted file mode 100644
index 2eb60898c46..00000000000
--- a/storage/innobase/include/row0mysql.ic
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2001, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/row0mysql.ic
-MySQL interface for Innobase
-
-Created 1/23/2001 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/row0purge.h b/storage/innobase/include/row0purge.h
index 32a989833bc..3cf4a7b982a 100644
--- a/storage/innobase/include/row0purge.h
+++ b/storage/innobase/include/row0purge.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1997, 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
the terms of the GNU General Public License as published by the Free Software
@@ -128,8 +129,4 @@ struct purge_node_t{
#endif
};
-#ifndef UNIV_NONINL
-#include "row0purge.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/row0purge.ic b/storage/innobase/include/row0purge.ic
deleted file mode 100644
index 700106d1048..00000000000
--- a/storage/innobase/include/row0purge.ic
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1997, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-
-/**************************************************//**
-@file include/row0purge.ic
-Purge obsolete records
-
-Created 3/14/1997 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/row0quiesce.h b/storage/innobase/include/row0quiesce.h
index ae14b3c63c1..4519e2487ce 100644
--- a/storage/innobase/include/row0quiesce.h
+++ b/storage/innobase/include/row0quiesce.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 2012, 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
the terms of the GNU General Public License as published by the Free Software
@@ -64,8 +65,4 @@ row_quiesce_table_complete(
trx_t* trx) /*!< in/out: transaction/session */
MY_ATTRIBUTE((nonnull));
-#ifndef UNIV_NONINL
-#include "row0quiesce.ic"
-#endif
-
#endif /* row0quiesce_h */
diff --git a/storage/innobase/include/row0quiesce.ic b/storage/innobase/include/row0quiesce.ic
deleted file mode 100644
index f570a6aed05..00000000000
--- a/storage/innobase/include/row0quiesce.ic
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 2012, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/row0quiesce.ic
-
-Quiesce a tablespace.
-
-Created 2012-02-08 Sunny Bains
-*******************************************************/
-
diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h
index 9ae1387810a..60f256fb200 100644
--- a/storage/innobase/include/row0row.h
+++ b/storage/innobase/include/row0row.h
@@ -387,8 +387,6 @@ row_raw_format(
in bytes */
MY_ATTRIBUTE((nonnull, warn_unused_result));
-#ifndef UNIV_NONINL
#include "row0row.ic"
-#endif
#endif
diff --git a/storage/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h
index d9856a8c7e6..4173a8b2844 100644
--- a/storage/innobase/include/row0sel.h
+++ b/storage/innobase/include/row0sel.h
@@ -488,8 +488,6 @@ row_sel_field_store_in_mysql_format_func(
const byte* data, /*!< in: data to store */
ulint len); /*!< in: length of the data */
-#ifndef UNIV_NONINL
#include "row0sel.ic"
-#endif
#endif
diff --git a/storage/innobase/include/row0uins.h b/storage/innobase/include/row0uins.h
index 95a714d2338..15e6c33e55e 100644
--- a/storage/innobase/include/row0uins.h
+++ b/storage/innobase/include/row0uins.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1997, 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
the terms of the GNU General Public License as published by the Free Software
@@ -47,8 +48,5 @@ row_undo_ins(
undo_node_t* node, /*!< in: row undo node */
que_thr_t* thr) /*!< in: query thread */
MY_ATTRIBUTE((nonnull, warn_unused_result));
-#ifndef UNIV_NONINL
-#include "row0uins.ic"
-#endif
#endif
diff --git a/storage/innobase/include/row0uins.ic b/storage/innobase/include/row0uins.ic
deleted file mode 100644
index 54da2e49874..00000000000
--- a/storage/innobase/include/row0uins.ic
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1997, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/row0uins.ic
-Fresh insert undo
-
-Created 2/25/1997 Heikki Tuuri
-*******************************************************/
-
diff --git a/storage/innobase/include/row0umod.h b/storage/innobase/include/row0umod.h
index a1bb42035a9..ef2dd491efd 100644
--- a/storage/innobase/include/row0umod.h
+++ b/storage/innobase/include/row0umod.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1997, 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
the terms of the GNU General Public License as published by the Free Software
@@ -44,8 +45,4 @@ row_undo_mod(
que_thr_t* thr) /*!< in: query thread */
MY_ATTRIBUTE((warn_unused_result));
-#ifndef UNIV_NONINL
-#include "row0umod.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/row0umod.ic b/storage/innobase/include/row0umod.ic
deleted file mode 100644
index 00a8cd86e01..00000000000
--- a/storage/innobase/include/row0umod.ic
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1997, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/row0umod.ic
-Undo modify of a row
-
-Created 2/27/1997 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h
index 3d5b3574afa..730e7f559c6 100644
--- a/storage/innobase/include/row0undo.h
+++ b/storage/innobase/include/row0undo.h
@@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1997, 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
the terms of the GNU General Public License as published by the Free Software
@@ -125,9 +126,4 @@ struct undo_node_t{
on a row */
};
-
-#ifndef UNIV_NONINL
-#include "row0undo.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/row0undo.ic b/storage/innobase/include/row0undo.ic
deleted file mode 100644
index b97ffca590e..00000000000
--- a/storage/innobase/include/row0undo.ic
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1997, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/row0undo.ic
-Row undo
-
-Created 1/8/1997 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/row0upd.h b/storage/innobase/include/row0upd.h
index 86b282553d8..359d243a0cd 100644
--- a/storage/innobase/include/row0upd.h
+++ b/storage/innobase/include/row0upd.h
@@ -652,8 +652,6 @@ struct upd_node_t{
changed in the update */
-#ifndef UNIV_NONINL
#include "row0upd.ic"
-#endif
#endif
diff --git a/storage/innobase/include/row0vers.h b/storage/innobase/include/row0vers.h
index 489db305fac..b28533578e1 100644
--- a/storage/innobase/include/row0vers.h
+++ b/storage/innobase/include/row0vers.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1997, 2015, 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
@@ -146,9 +146,4 @@ row_vers_build_for_semi_consistent_read(
const dtuple_t**vrow); /*!< out: holds virtual column info if any
is updated in the view */
-
-#ifndef UNIV_NONINL
-#include "row0vers.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/row0vers.ic b/storage/innobase/include/row0vers.ic
deleted file mode 100644
index ef43a55bf70..00000000000
--- a/storage/innobase/include/row0vers.ic
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1997, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/row0vers.ic
-Row versions
-
-Created 2/6/1997 Heikki Tuuri
-*******************************************************/
-
-#include "row0row.h"
-#include "dict0dict.h"
-#include "read0read.h"
-#include "page0page.h"
-#include "log0recv.h"
diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h
index 3697604425c..1b1597d0fba 100644
--- a/storage/innobase/include/srv0mon.h
+++ b/storage/innobase/include/srv0mon.h
@@ -889,8 +889,6 @@ void
srv_mon_default_on(void);
/*====================*/
-#ifndef UNIV_NONINL
#include "srv0mon.ic"
-#endif
#endif
diff --git a/storage/innobase/include/srv0srv.ic b/storage/innobase/include/srv0srv.ic
deleted file mode 100644
index 53405c06f97..00000000000
--- a/storage/innobase/include/srv0srv.ic
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1995, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/srv0srv.ic
-Server main program
-
-Created 10/4/1995 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/sync0arr.h b/storage/innobase/include/sync0arr.h
index 23b9b746d20..3b352022eaa 100644
--- a/storage/innobase/include/sync0arr.h
+++ b/storage/innobase/include/sync0arr.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2015, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
@@ -138,8 +138,6 @@ sync_array_get_nth_cell(
sync_array_t* arr, /*!< in: sync array */
ulint n); /*!< in: index */
-#ifndef UNIV_NONINL
#include "sync0arr.ic"
-#endif /* UNIV_NOINL */
#endif /* sync0arr_h */
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 */
diff --git a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h
index cf4a646cdcc..6218f0d9012 100644
--- a/storage/innobase/include/sync0rw.h
+++ b/storage/innobase/include/sync0rw.h
@@ -884,8 +884,6 @@ pfs_rw_lock_free_func(
rw_lock_t* lock); /*!< in: rw-lock */
#endif /* UNIV_PFS_RWLOCK */
-#ifndef UNIV_NONINL
#include "sync0rw.ic"
-#endif /* !UNIV_NONINL */
#endif /* sync0rw.h */
diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h
index a99f65a97f3..c9f5edb1432 100644
--- a/storage/innobase/include/trx0purge.h
+++ b/storage/innobase/include/trx0purge.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
@@ -576,8 +576,6 @@ struct trx_purge_rec_t {
roll_ptr_t roll_ptr; /*!< File pointr to UNDO record */
};
-#ifndef UNIV_NONINL
#include "trx0purge.ic"
-#endif /* UNIV_NOINL */
#endif /* trx0purge_h */
diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h
index 5fc9da9d445..98ab53e01ec 100644
--- a/storage/innobase/include/trx0rec.h
+++ b/storage/innobase/include/trx0rec.h
@@ -354,8 +354,6 @@ record */
#define TRX_UNDO_INSERT_OP 1U
#define TRX_UNDO_MODIFY_OP 2U
-#ifndef UNIV_NONINL
#include "trx0rec.ic"
-#endif
#endif /* trx0rec_h */
diff --git a/storage/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h
index 1f2e98b9708..8908376bff1 100644
--- a/storage/innobase/include/trx0roll.h
+++ b/storage/innobase/include/trx0roll.h
@@ -220,8 +220,6 @@ struct trx_named_savept_t{
transaction */
};
-#ifndef UNIV_NONINL
#include "trx0roll.ic"
-#endif
#endif
diff --git a/storage/innobase/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h
index a3e770b4f21..e17d11b383e 100644
--- a/storage/innobase/include/trx0rseg.h
+++ b/storage/innobase/include/trx0rseg.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -233,8 +233,6 @@ struct trx_rseg_t {
/* Undo log segment slots */
/*-------------------------------------------------------------*/
-#ifndef UNIV_NONINL
#include "trx0rseg.ic"
-#endif
#endif
diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
index bde1bf39627..57ab3b44f2d 100644
--- a/storage/innobase/include/trx0sys.h
+++ b/storage/innobase/include/trx0sys.h
@@ -640,8 +640,6 @@ page is updated */
trx_sys->mutex.exit(); \
} while (0)
-#ifndef UNIV_NONINL
#include "trx0sys.ic"
-#endif
#endif
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index 55f80f584c5..9e06e972619 100644
--- a/storage/innobase/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
@@ -1605,8 +1605,6 @@ private:
trx_t* m_trx;
};
-#ifndef UNIV_NONINL
#include "trx0trx.ic"
-#endif
#endif
diff --git a/storage/innobase/include/trx0undo.h b/storage/innobase/include/trx0undo.h
index dcfbaaa02de..cdf97b6a9cf 100644
--- a/storage/innobase/include/trx0undo.h
+++ b/storage/innobase/include/trx0undo.h
@@ -582,9 +582,7 @@ quite a large overhead. */
with the XA XID */
/* @} */
-#ifndef UNIV_NONINL
#include "trx0undo.ic"
-#endif
#endif /* !UNIV_INNOCHECKSUM */
#endif
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index 35f36155bcd..cb2674ebddf 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -280,20 +280,8 @@ rarely invoked function for size instead for speed. */
# define UNIV_COLD /* empty */
#endif
-#ifndef UNIV_MUST_NOT_INLINE
-/* Definition for inline version */
-
#define UNIV_INLINE static inline
-#else /* !UNIV_MUST_NOT_INLINE */
-/* If we want to compile a noninlined version we use the following macro
-definitions: */
-
-#define UNIV_NONINL
-#define UNIV_INLINE
-
-#endif /* !UNIV_MUST_NOT_INLINE */
-
#ifdef _WIN32
# ifdef _WIN64
# define UNIV_WORD_SIZE 8
diff --git a/storage/innobase/include/usr0sess.h b/storage/innobase/include/usr0sess.h
index 21c32986259..8e9497a85c5 100644
--- a/storage/innobase/include/usr0sess.h
+++ b/storage/innobase/include/usr0sess.h
@@ -1,6 +1,7 @@
/*****************************************************************************
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
the terms of the GNU General Public License as published by the Free Software
@@ -65,8 +66,4 @@ struct sess_t{
#define SESS_ERROR 2 /* session contains an error message
which has not yet been communicated
to the client */
-#ifndef UNIV_NONINL
-#include "usr0sess.ic"
-#endif
-
#endif
diff --git a/storage/innobase/include/usr0sess.ic b/storage/innobase/include/usr0sess.ic
deleted file mode 100644
index 284e59537fe..00000000000
--- a/storage/innobase/include/usr0sess.ic
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1996, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/**************************************************//**
-@file include/usr0sess.ic
-Sessions
-
-Created 6/25/1996 Heikki Tuuri
-*******************************************************/
diff --git a/storage/innobase/include/ut0byte.h b/storage/innobase/include/ut0byte.h
index bcf1b8e4a2d..59a813a2590 100644
--- a/storage/innobase/include/ut0byte.h
+++ b/storage/innobase/include/ut0byte.h
@@ -112,8 +112,6 @@ ut_bit_set_nth(
ulint n, /*!< in: nth bit requested */
ibool val); /*!< in: value for the bit to set */
-#ifndef UNIV_NONINL
#include "ut0byte.ic"
-#endif
#endif
diff --git a/storage/innobase/include/ut0list.h b/storage/innobase/include/ut0list.h
index 3b91384bbff..f78c9811060 100644
--- a/storage/innobase/include/ut0list.h
+++ b/storage/innobase/include/ut0list.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 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
@@ -175,8 +175,6 @@ struct ib_list_helper_t {
void* data; /*!< user data */
};
-#ifndef UNIV_NONINL
#include "ut0list.ic"
-#endif
#endif
diff --git a/storage/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h
index f20273daca6..68fdb417f27 100644
--- a/storage/innobase/include/ut0mem.h
+++ b/storage/innobase/include/ut0mem.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 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
@@ -170,8 +170,6 @@ ut_str_sql_format(
ulint buf_size); /*!< in: output buffer size
in bytes */
-#ifndef UNIV_NONINL
#include "ut0mem.ic"
-#endif
#endif
diff --git a/storage/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h
index aa5b4b6745d..49ae3c81356 100644
--- a/storage/innobase/include/ut0rnd.h
+++ b/storage/innobase/include/ut0rnd.h
@@ -133,9 +133,6 @@ ut_fold_binary(
ulint len) /*!< in: length */
MY_ATTRIBUTE((pure));
-
-#ifndef UNIV_NONINL
#include "ut0rnd.ic"
-#endif
#endif
diff --git a/storage/innobase/include/ut0timer.h b/storage/innobase/include/ut0timer.h
index f361ae79bf5..ea4dddec683 100644
--- a/storage/innobase/include/ut0timer.h
+++ b/storage/innobase/include/ut0timer.h
@@ -97,8 +97,6 @@ ut_microseconds_to_timer(
/*=====================*/
ulonglong when); /*!< in: time where to calculate */
-#ifndef UNIV_NONINL
#include "ut0timer.ic"
-#endif
#endif
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index fb8b66ddd39..bf127517051 100644
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -610,9 +610,7 @@ private:
} // namespace ib
-#ifndef UNIV_NONINL
#include "ut0ut.ic"
-#endif
#endif
diff --git a/storage/innobase/include/ut0vec.h b/storage/innobase/include/ut0vec.h
index b5c0beddc15..13b561a3a4f 100644
--- a/storage/innobase/include/ut0vec.h
+++ b/storage/innobase/include/ut0vec.h
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 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
@@ -281,8 +281,6 @@ struct ib_vector_t {
ulint sizeof_value;
};
-#ifndef UNIV_NONINL
#include "ut0vec.ic"
-#endif
#endif /* IB_VECTOR_H */
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index 11c1bedd39a..176eec18d12 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -34,12 +34,6 @@ Created 5/7/1996 Heikki Tuuri
#include "lock0lock.h"
#include "lock0priv.h"
-
-#ifdef UNIV_NONINL
-#include "lock0lock.ic"
-#include "lock0priv.ic"
-#endif
-
#include "dict0mem.h"
#include "usr0sess.h"
#include "trx0purge.h"
diff --git a/storage/innobase/lock/lock0prdt.cc b/storage/innobase/lock/lock0prdt.cc
index d26ae0f91e4..dda047162b2 100644
--- a/storage/innobase/lock/lock0prdt.cc
+++ b/storage/innobase/lock/lock0prdt.cc
@@ -28,13 +28,6 @@ Created 9/7/2013 Jimmy Yang
#include "lock0lock.h"
#include "lock0priv.h"
#include "lock0prdt.h"
-
-#ifdef UNIV_NONINL
-#include "lock0lock.ic"
-#include "lock0priv.ic"
-#include "lock0prdt.ic"
-#endif
-
#include "ha_prototypes.h"
#include "usr0sess.h"
#include "trx0purge.h"
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
index 00799895e47..78641907bf4 100644
--- a/storage/innobase/log/log0log.cc
+++ b/storage/innobase/log/log0log.cc
@@ -35,11 +35,6 @@ Created 12/9/1995 Heikki Tuuri
#include <debug_sync.h>
#include "log0log.h"
-
-#ifdef UNIV_NONINL
-#include "log0log.ic"
-#endif
-
#include "log0crypt.h"
#include "mem0mem.h"
#include "buf0buf.h"
diff --git a/storage/innobase/mach/mach0data.cc b/storage/innobase/mach/mach0data.cc
index 2d3e6730f75..b22da00c0f1 100644
--- a/storage/innobase/mach/mach0data.cc
+++ b/storage/innobase/mach/mach0data.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 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
@@ -26,10 +26,6 @@ Created 11/28/1995 Heikki Tuuri
#include "mach0data.h"
-#ifdef UNIV_NONINL
-#include "mach0data.ic"
-#endif
-
/** Read a 32-bit integer in a compressed form.
@param[in,out] ptr pointer to memory where to read;
advanced by the number of bytes consumed, or set NULL if out of space
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>
diff --git a/storage/innobase/mtr/mtr0log.cc b/storage/innobase/mtr/mtr0log.cc
index 783fdcd05ac..7d97aaa3f42 100644
--- a/storage/innobase/mtr/mtr0log.cc
+++ b/storage/innobase/mtr/mtr0log.cc
@@ -24,11 +24,6 @@ Created 12/7/1995 Heikki Tuuri
*******************************************************/
#include "mtr0log.h"
-
-#ifdef UNIV_NONINL
-#include "mtr0log.ic"
-#endif /* UNIV_NOINL */
-
#include "buf0buf.h"
#include "dict0dict.h"
#include "log0recv.h"
diff --git a/storage/innobase/mtr/mtr0mtr.cc b/storage/innobase/mtr/mtr0mtr.cc
index bc5ed98578a..c626937b0d8 100644
--- a/storage/innobase/mtr/mtr0mtr.cc
+++ b/storage/innobase/mtr/mtr0mtr.cc
@@ -36,10 +36,6 @@ Created 11/26/1995 Heikki Tuuri
#include "log0recv.h"
-#ifdef UNIV_NONINL
-#include "mtr0mtr.ic"
-#endif /* UNIV_NONINL */
-
/** Iterate over a memo block in reverse. */
template <typename Functor>
struct Iterate {
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 559112ee7f7..b8640042f0f 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -40,10 +40,6 @@ Created 10/21/1995 Heikki Tuuri
#include "os0file.h"
-#ifdef UNIV_NONINL
-#include "os0file.ic"
-#endif
-
#ifdef UNIV_LINUX
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/storage/innobase/os/os0proc.cc b/storage/innobase/os/os0proc.cc
index 801e4e8b9d9..9309c1f2c97 100644
--- a/storage/innobase/os/os0proc.cc
+++ b/storage/innobase/os/os0proc.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 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
@@ -27,10 +27,6 @@ Created 9/30/1995 Heikki Tuuri
#include "ha_prototypes.h"
#include "os0proc.h"
-#ifdef UNIV_NONINL
-#include "os0proc.ic"
-#endif
-
#include "srv0srv.h"
#include "ut0mem.h"
#include "ut0byte.h"
diff --git a/storage/innobase/os/os0thread.cc b/storage/innobase/os/os0thread.cc
index 8039c2e4f46..4012c281f8d 100644
--- a/storage/innobase/os/os0thread.cc
+++ b/storage/innobase/os/os0thread.cc
@@ -27,11 +27,6 @@ Created 9/8/1995 Heikki Tuuri
#include "os0thread.h"
#include "ut0new.h"
-
-#ifdef UNIV_NONINL
-#include "os0thread.ic"
-#endif
-
#include "srv0srv.h"
#include "os0event.h"
#include <map>
diff --git a/storage/innobase/page/page0cur.cc b/storage/innobase/page/page0cur.cc
index 16bdf602e81..f2ba1c64229 100644
--- a/storage/innobase/page/page0cur.cc
+++ b/storage/innobase/page/page0cur.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1994, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2012, Facebook Inc.
This program is free software; you can redistribute it and/or modify it under
@@ -27,10 +27,6 @@ Created 10/4/1994 Heikki Tuuri
#include "ha_prototypes.h"
#include "page0cur.h"
-#ifdef UNIV_NONINL
-#include "page0cur.ic"
-#endif
-
#include "page0zip.h"
#include "btr0btr.h"
#include "mtr0log.h"
diff --git a/storage/innobase/page/page0page.cc b/storage/innobase/page/page0page.cc
index d38b426b0d4..437b6c01a41 100644
--- a/storage/innobase/page/page0page.cc
+++ b/storage/innobase/page/page0page.cc
@@ -26,10 +26,6 @@ Created 2/2/1994 Heikki Tuuri
*******************************************************/
#include "page0page.h"
-#ifdef UNIV_NONINL
-#include "page0page.ic"
-#endif
-
#include "page0cur.h"
#include "page0zip.h"
#include "buf0buf.h"
diff --git a/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc
index c0746bd9d5f..a9301ba9b5c 100644
--- a/storage/innobase/page/page0zip.cc
+++ b/storage/innobase/page/page0zip.cc
@@ -27,9 +27,6 @@ Created June 2005 by Marko Makela
#include "page0size.h"
#include "page0zip.h"
-#ifdef UNIV_NONINL
-# include "page0zip.ic"
-#endif
/** A BLOB field reference full of zero, for use in assertions and tests.
Initially, BLOB field references are set to zero, in
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"
diff --git a/storage/innobase/que/que0que.cc b/storage/innobase/que/que0que.cc
index 9fd12686f57..1aebef93ce5 100644
--- a/storage/innobase/que/que0que.cc
+++ b/storage/innobase/que/que0que.cc
@@ -27,11 +27,6 @@ Created 5/27/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "que0que.h"
-
-#ifdef UNIV_NONINL
-#include "que0que.ic"
-#endif
-
#include "usr0sess.h"
#include "trx0trx.h"
#include "trx0roll.h"
diff --git a/storage/innobase/rem/rem0cmp.cc b/storage/innobase/rem/rem0cmp.cc
index 9cd0f76c7a9..b14d9c77ad1 100644
--- a/storage/innobase/rem/rem0cmp.cc
+++ b/storage/innobase/rem/rem0cmp.cc
@@ -26,11 +26,6 @@ Created 7/1/1994 Heikki Tuuri
#include "ha_prototypes.h"
#include "rem0cmp.h"
-
-#ifdef UNIV_NONINL
-#include "rem0cmp.ic"
-#endif
-
#include "handler0alter.h"
#include "srv0srv.h"
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc
index d79b25a35a7..34799c7283e 100644
--- a/storage/innobase/rem/rem0rec.cc
+++ b/storage/innobase/rem/rem0rec.cc
@@ -25,11 +25,6 @@ Created 5/30/1994 Heikki Tuuri
*************************************************************************/
#include "rem0rec.h"
-
-#ifdef UNIV_NONINL
-#include "rem0rec.ic"
-#endif
-
#include "page0page.h"
#include "mtr0mtr.h"
#include "mtr0log.h"
diff --git a/storage/innobase/row/row0ext.cc b/storage/innobase/row/row0ext.cc
index 38c4e2ba6fb..72c68940d11 100644
--- a/storage/innobase/row/row0ext.cc
+++ b/storage/innobase/row/row0ext.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 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 September 2006 Marko Makela
*******************************************************/
#include "row0ext.h"
-
-#ifdef UNIV_NONINL
-#include "row0ext.ic"
-#endif
-
#include "btr0cur.h"
/** Fills the column prefix cache of an externally stored column.
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index 27f5067fbfb..9bd5cedc8bb 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -27,11 +27,6 @@ Created 2012-02-08 by Sunny Bains.
#include "ha_prototypes.h"
#include "row0import.h"
-
-#ifdef UNIV_NONINL
-#include "row0import.ic"
-#endif
-
#include "btr0pcur.h"
#include "que0que.h"
#include "dict0boot.h"
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc
index bd776815abd..d3fc2215a17 100644
--- a/storage/innobase/row/row0ins.cc
+++ b/storage/innobase/row/row0ins.cc
@@ -27,11 +27,6 @@ Created 4/20/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "row0ins.h"
-
-#ifdef UNIV_NONINL
-#include "row0ins.ic"
-#endif
-
#include "dict0dict.h"
#include "dict0boot.h"
#include "trx0rec.h"
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc
index 0fc1dd097cc..7e6975a67f1 100644
--- a/storage/innobase/row/row0log.cc
+++ b/storage/innobase/row/row0log.cc
@@ -25,11 +25,6 @@ Created 2011-05-26 Marko Makela
*******************************************************/
#include "row0log.h"
-
-#ifdef UNIV_NONINL
-#include "row0log.ic"
-#endif
-
#include "row0row.h"
#include "row0ins.h"
#include "row0upd.h"
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
index ab5736f88d7..40bafcc4303 100644
--- a/storage/innobase/row/row0mysql.cc
+++ b/storage/innobase/row/row0mysql.cc
@@ -31,11 +31,6 @@ Created 9/17/2000 Heikki Tuuri
#include <spatial.h>
#include "row0mysql.h"
-
-#ifdef UNIV_NONINL
-#include "row0mysql.ic"
-#endif
-
#include "btr0sea.h"
#include "dict0boot.h"
#include "dict0crea.h"
diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc
index 6f669e5809a..ce9a265bd8c 100644
--- a/storage/innobase/row/row0purge.cc
+++ b/storage/innobase/row/row0purge.cc
@@ -24,11 +24,6 @@ Created 3/14/1997 Heikki Tuuri
*******************************************************/
#include "row0purge.h"
-
-#ifdef UNIV_NONINL
-#include "row0purge.ic"
-#endif
-
#include "fsp0fsp.h"
#include "mach0data.h"
#include "trx0rseg.h"
diff --git a/storage/innobase/row/row0quiesce.cc b/storage/innobase/row/row0quiesce.cc
index d26d81c9239..8bd1f5730a2 100644
--- a/storage/innobase/row/row0quiesce.cc
+++ b/storage/innobase/row/row0quiesce.cc
@@ -26,10 +26,6 @@ Created 2012-02-08 by Sunny Bains.
#include "ha_prototypes.h"
#include "row0quiesce.h"
-#ifdef UNIV_NONINL
-#include "row0quiesce.ic"
-#endif
-
#include "row0mysql.h"
#include "ibuf0ibuf.h"
#include "srv0start.h"
diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc
index 0f15299e71a..9b5ef6a3f3c 100644
--- a/storage/innobase/row/row0row.cc
+++ b/storage/innobase/row/row0row.cc
@@ -26,11 +26,6 @@ Created 4/20/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "row0row.h"
-
-#ifdef UNIV_NONINL
-#include "row0row.ic"
-#endif
-
#include "data0type.h"
#include "dict0dict.h"
#include "dict0boot.h"
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index 5ca676b6cc6..f2686346a82 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -32,11 +32,6 @@ Created 12/19/1997 Heikki Tuuri
*******************************************************/
#include "row0sel.h"
-
-#ifdef UNIV_NONINL
-#include "row0sel.ic"
-#endif
-
#include "dict0dict.h"
#include "dict0boot.h"
#include "trx0undo.h"
diff --git a/storage/innobase/row/row0uins.cc b/storage/innobase/row/row0uins.cc
index 27be7c1600e..25504e32087 100644
--- a/storage/innobase/row/row0uins.cc
+++ b/storage/innobase/row/row0uins.cc
@@ -24,11 +24,6 @@ Created 2/25/1997 Heikki Tuuri
*******************************************************/
#include "row0uins.h"
-
-#ifdef UNIV_NONINL
-#include "row0uins.ic"
-#endif
-
#include "dict0dict.h"
#include "dict0boot.h"
#include "dict0crea.h"
diff --git a/storage/innobase/row/row0umod.cc b/storage/innobase/row/row0umod.cc
index 81c86f8b6f7..378cad00b93 100644
--- a/storage/innobase/row/row0umod.cc
+++ b/storage/innobase/row/row0umod.cc
@@ -26,11 +26,6 @@ Created 2/27/1997 Heikki Tuuri
#include "ha_prototypes.h"
#include "row0umod.h"
-
-#ifdef UNIV_NONINL
-#include "row0umod.ic"
-#endif
-
#include "dict0dict.h"
#include "dict0boot.h"
#include "trx0undo.h"
diff --git a/storage/innobase/row/row0undo.cc b/storage/innobase/row/row0undo.cc
index dd4dc89d945..b9e79e044de 100644
--- a/storage/innobase/row/row0undo.cc
+++ b/storage/innobase/row/row0undo.cc
@@ -26,11 +26,6 @@ Created 1/8/1997 Heikki Tuuri
#include "ha_prototypes.h"
#include "row0undo.h"
-
-#ifdef UNIV_NONINL
-#include "row0undo.ic"
-#endif
-
#include "fsp0fsp.h"
#include "mach0data.h"
#include "trx0rseg.h"
diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc
index 72271598a6c..e95ba9426bb 100644
--- a/storage/innobase/row/row0upd.cc
+++ b/storage/innobase/row/row0upd.cc
@@ -27,11 +27,6 @@ Created 12/27/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "row0upd.h"
-
-#ifdef UNIV_NONINL
-#include "row0upd.ic"
-#endif
-
#include "dict0dict.h"
#include "dict0mem.h"
#include "trx0undo.h"
diff --git a/storage/innobase/row/row0vers.cc b/storage/innobase/row/row0vers.cc
index 69e7a889de9..de33c7c4d1b 100644
--- a/storage/innobase/row/row0vers.cc
+++ b/storage/innobase/row/row0vers.cc
@@ -27,11 +27,6 @@ Created 2/6/1997 Heikki Tuuri
#include "ha_prototypes.h"
#include "row0vers.h"
-
-#ifdef UNIV_NONINL
-#include "row0vers.ic"
-#endif
-
#include "dict0dict.h"
#include "dict0boot.h"
#include "btr0btr.h"
diff --git a/storage/innobase/srv/srv0mon.cc b/storage/innobase/srv/srv0mon.cc
index f42e640f4f3..5a3e1a2c930 100644
--- a/storage/innobase/srv/srv0mon.cc
+++ b/storage/innobase/srv/srv0mon.cc
@@ -35,9 +35,6 @@ Created 12/9/2009 Jimmy Yang
#include "srv0srv.h"
#include "trx0rseg.h"
#include "trx0sys.h"
-#ifdef UNIV_NONINL
-#include "srv0mon.ic"
-#endif
/* Macro to standardize the counter names for counters in the
"monitor_buf_page" module as they have very structured defines */
diff --git a/storage/innobase/sync/sync0arr.cc b/storage/innobase/sync/sync0arr.cc
index 1b561dc3297..f940eae5a6c 100644
--- a/storage/innobase/sync/sync0arr.cc
+++ b/storage/innobase/sync/sync0arr.cc
@@ -32,13 +32,7 @@ Created 9/5/1995 Heikki Tuuri
*******************************************************/
#include "ha_prototypes.h"
-#include "univ.i"
-
#include "sync0arr.h"
-#ifdef UNIV_NONINL
-#include "sync0arr.ic"
-#endif
-
#include <mysqld_error.h>
#include <mysql/plugin.h>
#include <hash.h>
diff --git a/storage/innobase/sync/sync0rw.cc b/storage/innobase/sync/sync0rw.cc
index 497f7f3f9e9..892e54f5082 100644
--- a/storage/innobase/sync/sync0rw.cc
+++ b/storage/innobase/sync/sync0rw.cc
@@ -32,11 +32,6 @@ Created 9/11/1995 Heikki Tuuri
*******************************************************/
#include "sync0rw.h"
-#ifdef UNIV_NONINL
-#include "sync0rw.ic"
-#include "sync0arr.ic"
-#endif
-
#include "ha_prototypes.h"
#include "os0thread.h"
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
index e674957aeda..6ff4c882be8 100644
--- a/storage/innobase/trx/trx0purge.cc
+++ b/storage/innobase/trx/trx0purge.cc
@@ -27,11 +27,6 @@ Created 3/26/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "trx0purge.h"
-
-#ifdef UNIV_NONINL
-#include "trx0purge.ic"
-#endif
-
#include "fsp0fsp.h"
#include "fut0fut.h"
#include "mach0data.h"
diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc
index 747c247702e..c28eae50e66 100644
--- a/storage/innobase/trx/trx0rec.cc
+++ b/storage/innobase/trx/trx0rec.cc
@@ -25,11 +25,6 @@ Created 3/26/1996 Heikki Tuuri
*******************************************************/
#include "trx0rec.h"
-
-#ifdef UNIV_NONINL
-#include "trx0rec.ic"
-#endif
-
#include "fsp0fsp.h"
#include "mach0data.h"
#include "trx0undo.h"
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
index 21d08b79876..cc41d318188 100644
--- a/storage/innobase/trx/trx0roll.cc
+++ b/storage/innobase/trx/trx0roll.cc
@@ -28,10 +28,6 @@ Created 3/26/1996 Heikki Tuuri
#include "trx0roll.h"
-#ifdef UNIV_NONINL
-#include "trx0roll.ic"
-#endif
-
#include <mysql/service_wsrep.h>
#include "fsp0fsp.h"
diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc
index 9fcc10ec975..883e2eb60b2 100644
--- a/storage/innobase/trx/trx0rseg.cc
+++ b/storage/innobase/trx/trx0rseg.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -25,11 +25,6 @@ Created 3/26/1996 Heikki Tuuri
*******************************************************/
#include "trx0rseg.h"
-
-#ifdef UNIV_NONINL
-#include "trx0rseg.ic"
-#endif
-
#include "trx0undo.h"
#include "fut0lst.h"
#include "srv0srv.h"
diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc
index ffee282d498..c063d2277f9 100644
--- a/storage/innobase/trx/trx0sys.cc
+++ b/storage/innobase/trx/trx0sys.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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
@@ -29,9 +29,6 @@ Created 3/26/1996 Heikki Tuuri
#include "mysqld.h"
#include "trx0sys.h"
#include "sql_error.h"
-#ifdef UNIV_NONINL
-#include "trx0sys.ic"
-#endif
#include "fsp0fsp.h"
#include "mtr0log.h"
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index c9616023d85..c196707ad20 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -28,10 +28,6 @@ Created 3/26/1996 Heikki Tuuri
#include "trx0trx.h"
-#ifdef UNIV_NONINL
-#include "trx0trx.ic"
-#endif
-
#ifdef WITH_WSREP
#include <mysql/service_wsrep.h>
#endif
diff --git a/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc
index ed22a636c4e..d92f6641910 100644
--- a/storage/innobase/trx/trx0undo.cc
+++ b/storage/innobase/trx/trx0undo.cc
@@ -27,11 +27,6 @@ Created 3/26/1996 Heikki Tuuri
#include "ha_prototypes.h"
#include "trx0undo.h"
-
-#ifdef UNIV_NONINL
-#include "trx0undo.ic"
-#endif
-
#include "fsp0fsp.h"
#include "mach0data.h"
#include "mtr0log.h"
diff --git a/storage/innobase/usr/usr0sess.cc b/storage/innobase/usr/usr0sess.cc
index 0cb2ea0db15..85eca604d80 100644
--- a/storage/innobase/usr/usr0sess.cc
+++ b/storage/innobase/usr/usr0sess.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 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 6/25/1996 Heikki Tuuri
*******************************************************/
#include "usr0sess.h"
-
-#ifdef UNIV_NONINL
-#include "usr0sess.ic"
-#endif
-
#include "trx0trx.h"
/*********************************************************************//**
diff --git a/storage/innobase/ut/ut0byte.cc b/storage/innobase/ut/ut0byte.cc
deleted file mode 100644
index bc592edc6bf..00000000000
--- a/storage/innobase/ut/ut0byte.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
-
-Copyright (c) 1994, 2009, 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
-Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-
-*****************************************************************************/
-
-/***************************************************************//**
-@file ut/ut0byte.cc
-Byte utilities
-
-Created 5/11/1994 Heikki Tuuri
-********************************************************************/
-
-#include "ut0byte.h"
-
-#ifdef UNIV_NONINL
-#include "ut0byte.ic"
-#endif
diff --git a/storage/innobase/ut/ut0list.cc b/storage/innobase/ut/ut0list.cc
index f62cbf8232b..fcf1377424e 100644
--- a/storage/innobase/ut/ut0list.cc
+++ b/storage/innobase/ut/ut0list.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 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,9 +24,6 @@ Created 4/26/2006 Osku Salerma
************************************************************************/
#include "ut0list.h"
-#ifdef UNIV_NONINL
-#include "ut0list.ic"
-#endif
/****************************************************************//**
Create a new list.
diff --git a/storage/innobase/ut/ut0mem.cc b/storage/innobase/ut/ut0mem.cc
index 39b86568aa3..0df025175d3 100644
--- a/storage/innobase/ut/ut0mem.cc
+++ b/storage/innobase/ut/ut0mem.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 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 5/11/1994 Heikki Tuuri
*************************************************************************/
#include "ut0mem.h"
-
-#ifdef UNIV_NONINL
-#include "ut0mem.ic"
-#endif
-
#include "os0thread.h"
#include "srv0srv.h"
#include <stdlib.h>
diff --git a/storage/innobase/ut/ut0rnd.cc b/storage/innobase/ut/ut0rnd.cc
index 2d2d8977ad7..64d70732580 100644
--- a/storage/innobase/ut/ut0rnd.cc
+++ b/storage/innobase/ut/ut0rnd.cc
@@ -25,10 +25,6 @@ Created 5/11/1994 Heikki Tuuri
#include "ut0rnd.h"
-#ifdef UNIV_NONINL
-#include "ut0rnd.ic"
-#endif
-
/** These random numbers are used in ut_find_prime */
/*@{*/
#define UT_RANDOM_1 1.0412321
diff --git a/storage/innobase/ut/ut0ut.cc b/storage/innobase/ut/ut0ut.cc
index 2b9e3115a03..c352323eca9 100644
--- a/storage/innobase/ut/ut0ut.cc
+++ b/storage/innobase/ut/ut0ut.cc
@@ -33,9 +33,6 @@ Created 5/11/1994 Heikki Tuuri
#include <mysql_com.h>
#include "os0thread.h"
#include "ut0ut.h"
-#ifdef UNIV_NONINL
-#include "ut0ut.ic"
-#endif
#include "trx0trx.h"
#include <string>
#include "log.h"
diff --git a/storage/innobase/ut/ut0vec.cc b/storage/innobase/ut/ut0vec.cc
index f4a893967c7..b652ad83b64 100644
--- a/storage/innobase/ut/ut0vec.cc
+++ b/storage/innobase/ut/ut0vec.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2006, 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,9 +24,6 @@ Created 4/6/2006 Osku Salerma
************************************************************************/
#include "ut0vec.h"
-#ifdef UNIV_NONINL
-#include "ut0vec.ic"
-#endif
#include "mem0mem.h"
/********************************************************************