diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-29 12:53:44 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-29 12:53:44 +0200 |
commit | 447e4931795a0ae9525005e8fb37bb7347d8ae52 (patch) | |
tree | 3301e33bed2cc99b26d12ccb9f569802e025295c /storage | |
parent | be998bfdc5940925c4e6f5970a5c0c1efcd6d21e (diff) | |
download | mariadb-git-447e4931795a0ae9525005e8fb37bb7347d8ae52.tar.gz |
Remove some unnecessary InnoDB #include
Diffstat (limited to 'storage')
117 files changed, 34 insertions, 273 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 2f6eb080958..03bf76fd299 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -31,7 +31,6 @@ The database buffer buf_pool Created 11/5/1995 Heikki Tuuri *******************************************************/ -#include "univ.i" #include "mtr0types.h" #include "mach0data.h" #include "page0size.h" diff --git a/storage/innobase/buf/buf0checksum.cc b/storage/innobase/buf/buf0checksum.cc index 4b56cc81e98..78b49e49690 100644 --- a/storage/innobase/buf/buf0checksum.cc +++ b/storage/innobase/buf/buf0checksum.cc @@ -24,18 +24,15 @@ Buffer pool checksum functions, also linked from /extra/innochecksum.cc Created Aug 11, 2011 Vasil Dimov *******************************************************/ -#include "univ.i" +#include "buf0checksum.h" #include "fil0fil.h" #include "ut0crc32.h" #include "ut0rnd.h" -#include "buf0checksum.h" #ifndef UNIV_INNOCHECKSUM #include "srv0srv.h" #endif /* !UNIV_INNOCHECKSUM */ -#include "buf0types.h" - /** the macro MYSQL_SYSVAR_ENUM() requires "long unsigned int" and if we use srv_checksum_algorithm_t here then we get a compiler error: ha_innodb.cc:12251: error: cannot convert 'srv_checksum_algorithm_t*' to diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc index 2a59c01d6db..ed2131bdcee 100644 --- a/storage/innobase/buf/buf0dump.cc +++ b/storage/innobase/buf/buf0dump.cc @@ -30,8 +30,6 @@ Created April 08, 2011 Vasil Dimov #include "mysql/psi/mysql_stage.h" #include "mysql/psi/psi.h" -#include "univ.i" - #include "buf0buf.h" #include "buf0dump.h" #include "dict0dict.h" diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc index 7f3930ba18b..efa5892fc66 100644 --- a/storage/innobase/dict/dict0stats.cc +++ b/storage/innobase/dict/dict0stats.cc @@ -24,14 +24,13 @@ Code used for calculating and manipulating table statistics. Created Jan 06, 2010 Vasil Dimov *******************************************************/ -#include "univ.i" +#include "dict0stats.h" #include "ut0ut.h" #include "ut0rnd.h" #include "dyn0buf.h" #include "row0sel.h" #include "trx0trx.h" #include "pars0pars.h" -#include "dict0stats.h" #include <mysql_com.h> #include "btr0btr.h" diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 7744c9079f2..21a2dddfb9f 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -32,13 +32,13 @@ Created 10/25/1995 Heikki Tuuri #include "buf0buf.h" #include "dict0boot.h" #include "dict0dict.h" +#include "dict0load.h" #include "fsp0file.h" #include "fsp0fsp.h" #include "hash0hash.h" #include "log0log.h" #include "log0recv.h" #include "mach0data.h" -#include "mem0mem.h" #include "mtr0log.h" #include "os0file.h" #include "page0zip.h" diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 67b0dd251af..6daffbd7ec1 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -71,6 +71,7 @@ this program; if not, write to the Free Software Foundation, Inc., #include "buf0flu.h" #include "buf0lru.h" #include "dict0boot.h" +#include "dict0load.h" #include "btr0defragment.h" #include "dict0crea.h" #include "dict0dict.h" @@ -85,10 +86,8 @@ this program; if not, write to the Free Software Foundation, Inc., #include "ibuf0ibuf.h" #include "lock0lock.h" #include "log0crypt.h" -#include "mem0mem.h" #include "mtr0mtr.h" #include "os0file.h" -#include "os0thread.h" #include "page0zip.h" #include "pars0pars.h" #include "rem0types.h" diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h index dc933bef6c4..967f738f4e3 100644 --- a/storage/innobase/include/btr0btr.h +++ b/storage/innobase/include/btr0btr.h @@ -2,7 +2,7 @@ Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2014, 2017, MariaDB Corporation. +Copyright (c) 2014, 2018, 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 @@ -28,12 +28,9 @@ Created 6/2/1994 Heikki Tuuri #ifndef btr0btr_h #define btr0btr_h -#include "univ.i" - #include "dict0dict.h" #include "data0data.h" #include "page0cur.h" -#include "mtr0mtr.h" #include "btr0types.h" #include "gis0type.h" diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h index 6d3e029998c..0f027536525 100644 --- a/storage/innobase/include/btr0cur.h +++ b/storage/innobase/include/btr0cur.h @@ -27,7 +27,6 @@ Created 10/16/1994 Heikki Tuuri #ifndef btr0cur_h #define btr0cur_h -#include "univ.i" #include "dict0dict.h" #include "page0cur.h" #include "btr0types.h" diff --git a/storage/innobase/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h index b84d9840a28..b9dd06dbf24 100644 --- a/storage/innobase/include/btr0pcur.h +++ b/storage/innobase/include/btr0pcur.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2018, 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 @@ -27,14 +27,9 @@ Created 2/23/1996 Heikki Tuuri #ifndef btr0pcur_h #define btr0pcur_h -#include "univ.i" #include "dict0dict.h" -#include "data0data.h" -#include "mtr0mtr.h" -#include "page0cur.h" #include "btr0cur.h" #include "btr0btr.h" -#include "btr0types.h" #include "gis0rtree.h" /* Relative positions for a stored cursor position */ diff --git a/storage/innobase/include/btr0scrub.h b/storage/innobase/include/btr0scrub.h index 8029cc91005..feaf61784d0 100644 --- a/storage/innobase/include/btr0scrub.h +++ b/storage/innobase/include/btr0scrub.h @@ -3,13 +3,7 @@ #ifndef btr0scrub_h #define btr0scrub_h -#include "univ.i" - #include "dict0dict.h" -#include "data0data.h" -#include "page0cur.h" -#include "mtr0mtr.h" -#include "btr0types.h" /** * enum describing page allocation status diff --git a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h index bacaca583c0..e6e442f28b6 100644 --- a/storage/innobase/include/btr0sea.h +++ b/storage/innobase/include/btr0sea.h @@ -27,12 +27,7 @@ Created 2/17/1996 Heikki Tuuri #ifndef btr0sea_h #define btr0sea_h -#include "univ.i" - -#include "rem0rec.h" #include "dict0dict.h" -#include "btr0types.h" -#include "mtr0mtr.h" #ifdef BTR_CUR_HASH_ADAPT #include "ha0ha.h" diff --git a/storage/innobase/include/btr0types.h b/storage/innobase/include/btr0types.h index 77d1b286fbb..f8685d34764 100644 --- a/storage/innobase/include/btr0types.h +++ b/storage/innobase/include/btr0types.h @@ -26,12 +26,9 @@ Created 2/17/1996 Heikki Tuuri #ifndef btr0types_h #define btr0types_h -#include "univ.i" - -#include "rem0types.h" #include "page0types.h" -#include "sync0rw.h" #include "page0size.h" +#include "rem0types.h" /** Persistent cursor */ struct btr_pcur_t; diff --git a/storage/innobase/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h index f56ac2e5e70..17efa65714c 100644 --- a/storage/innobase/include/buf0buddy.h +++ b/storage/innobase/include/buf0buddy.h @@ -31,7 +31,6 @@ Created December 2006 by Marko Makela # define UNIV_INLINE #endif -#include "univ.i" #include "buf0types.h" /**********************************************************************//** diff --git a/storage/innobase/include/buf0checksum.h b/storage/innobase/include/buf0checksum.h index 20955a5b2e6..0bac2b911ee 100644 --- a/storage/innobase/include/buf0checksum.h +++ b/storage/innobase/include/buf0checksum.h @@ -27,8 +27,6 @@ Created Aug 11, 2011 Vasil Dimov #ifndef buf0checksum_h #define buf0checksum_h -#include "univ.i" - #include "buf0types.h" /** Calculate the CRC32 checksum of a page. The value is stored to the page diff --git a/storage/innobase/include/buf0dblwr.h b/storage/innobase/include/buf0dblwr.h index 598609e2be4..8920d0ed4a8 100644 --- a/storage/innobase/include/buf0dblwr.h +++ b/storage/innobase/include/buf0dblwr.h @@ -27,7 +27,6 @@ Created 2011/12/19 Inaam Rana #ifndef buf0dblwr_h #define buf0dblwr_h -#include "univ.i" #include "ut0byte.h" #include "log0log.h" #include "buf0types.h" diff --git a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h index 5c1dddd9a3b..991ed33e890 100644 --- a/storage/innobase/include/buf0flu.h +++ b/storage/innobase/include/buf0flu.h @@ -27,7 +27,6 @@ Created 11/5/1995 Heikki Tuuri #ifndef buf0flu_h #define buf0flu_h -#include "univ.i" #include "ut0byte.h" #include "log0log.h" #include "buf0types.h" diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h index 10dcdb27eb0..6c7cf75cbe8 100644 --- a/storage/innobase/include/buf0lru.h +++ b/storage/innobase/include/buf0lru.h @@ -27,7 +27,6 @@ Created 11/5/1995 Heikki Tuuri #ifndef buf0lru_h #define buf0lru_h -#include "univ.i" #include "ut0byte.h" #include "buf0types.h" diff --git a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h index a7c43e01467..c32b0d3637e 100644 --- a/storage/innobase/include/buf0rea.h +++ b/storage/innobase/include/buf0rea.h @@ -27,9 +27,7 @@ Created 11/5/1995 Heikki Tuuri #ifndef buf0rea_h #define buf0rea_h -#include "univ.i" #include "buf0buf.h" -#include "buf0types.h" /** High-level function which reads a page asynchronously from a file to the buffer buf_pool if it is not already there. Sets the io_fix flag and sets diff --git a/storage/innobase/include/data0data.h b/storage/innobase/include/data0data.h index b6187d46025..c181aa01a38 100644 --- a/storage/innobase/include/data0data.h +++ b/storage/innobase/include/data0data.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2018, 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 @@ -27,8 +27,6 @@ Created 5/30/1994 Heikki Tuuri #ifndef data0data_h #define data0data_h -#include "univ.i" - #include "data0types.h" #include "data0type.h" #include "mem0mem.h" diff --git a/storage/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h index d6de7dcf71b..be0184820b1 100644 --- a/storage/innobase/include/dict0boot.h +++ b/storage/innobase/include/dict0boot.h @@ -26,13 +26,10 @@ Created 4/18/1996 Heikki Tuuri #ifndef dict0boot_h #define dict0boot_h -#include "univ.i" - #include "mtr0mtr.h" #include "mtr0log.h" #include "ut0byte.h" #include "buf0buf.h" -#include "fsp0fsp.h" #include "dict0dict.h" typedef byte dict_hdr_t; diff --git a/storage/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h index c57a63652a2..6b0092c0127 100644 --- a/storage/innobase/include/dict0crea.h +++ b/storage/innobase/include/dict0crea.h @@ -27,8 +27,6 @@ Created 1/8/1996 Heikki Tuuri #ifndef dict0crea_h #define dict0crea_h -#include "univ.i" -#include "dict0types.h" #include "dict0dict.h" #include "que0types.h" #include "row0types.h" diff --git a/storage/innobase/include/dict0defrag_bg.h b/storage/innobase/include/dict0defrag_bg.h index ddef139853c..fe75c6a21d1 100644 --- a/storage/innobase/include/dict0defrag_bg.h +++ b/storage/innobase/include/dict0defrag_bg.h @@ -27,12 +27,9 @@ Created 25/08/2016 Jan Lindström #ifndef dict0defrag_bg_h #define dict0defrag_bg_h -#include "univ.i" - -#include "dict0types.h" #include "os0event.h" #include "os0thread.h" - +#include "dict0types.h" /** Indices whose defrag stats need to be saved to persistent storage.*/ struct defrag_pool_item_t { diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index 44aff739d93..26d5ed34318 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -28,22 +28,10 @@ Created 1/8/1996 Heikki Tuuri #ifndef dict0dict_h #define dict0dict_h -#include "univ.i" #include "data0data.h" -#include "data0type.h" #include "dict0mem.h" -#include "dict0types.h" #include "fsp0fsp.h" -#include "hash0hash.h" -#include "mem0mem.h" -#include "rem0types.h" -#include "row0types.h" -#include "trx0types.h" -#include "ut0byte.h" -#include "ut0mem.h" -#include "ut0rnd.h" #include <deque> -#include "fsp0fsp.h" #include "dict0pagecompress.h" extern bool innodb_table_stats_not_found; diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index fe2f8e32b1a..337ded84f5f 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -24,12 +24,6 @@ Data dictionary system Created 1/8/1996 Heikki Tuuri ***********************************************************************/ -#include "data0type.h" -#include "dict0load.h" -#include "rem0types.h" -#include "fsp0fsp.h" -#include "srv0srv.h" -#include "sync0rw.h" #include "fsp0sysspace.h" /*********************************************************************//** diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index 671018d20e9..b8726d3136e 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -28,8 +28,6 @@ Created 1/8/1996 Heikki Tuuri #ifndef dict0mem_h #define dict0mem_h -#include "univ.i" -#include "dict0types.h" #include "data0type.h" #include "mem0mem.h" #include "row0types.h" diff --git a/storage/innobase/include/dict0priv.h b/storage/innobase/include/dict0priv.h index 593c27125a2..b216a16c181 100644 --- a/storage/innobase/include/dict0priv.h +++ b/storage/innobase/include/dict0priv.h @@ -26,8 +26,6 @@ Created Fri 2 Jul 2010 13:30:38 EST - Sunny Bains #ifndef dict0priv_h #define dict0priv_h -#include "univ.i" - /**********************************************************************//** Gets a table; loads it to the dictionary cache if necessary. A low-level function. Note: Not to be called from outside dict0*c functions. diff --git a/storage/innobase/include/dict0stats.h b/storage/innobase/include/dict0stats.h index 407e0221110..95507dca36c 100644 --- a/storage/innobase/include/dict0stats.h +++ b/storage/innobase/include/dict0stats.h @@ -27,8 +27,6 @@ Created Jan 06, 2010 Vasil Dimov #ifndef dict0stats_h #define dict0stats_h -#include "univ.i" - #include "dict0types.h" #include "trx0types.h" diff --git a/storage/innobase/include/dict0stats.ic b/storage/innobase/include/dict0stats.ic index 0d187ed90c7..4edc7860363 100644 --- a/storage/innobase/include/dict0stats.ic +++ b/storage/innobase/include/dict0stats.ic @@ -25,7 +25,6 @@ Created Jan 23, 2012 Vasil Dimov *******************************************************/ #include "dict0dict.h" -#include "dict0types.h" #include "srv0srv.h" /*********************************************************************//** diff --git a/storage/innobase/include/dict0stats_bg.h b/storage/innobase/include/dict0stats_bg.h index e66666b66a3..22bcb1504cc 100644 --- a/storage/innobase/include/dict0stats_bg.h +++ b/storage/innobase/include/dict0stats_bg.h @@ -27,8 +27,6 @@ Created Apr 26, 2012 Vasil Dimov #ifndef dict0stats_bg_h #define dict0stats_bg_h -#include "univ.i" - #include "dict0types.h" #include "os0event.h" #include "os0thread.h" diff --git a/storage/innobase/include/dyn0buf.h b/storage/innobase/include/dyn0buf.h index 3126c8e4683..c6c5a2233ca 100644 --- a/storage/innobase/include/dyn0buf.h +++ b/storage/innobase/include/dyn0buf.h @@ -26,10 +26,9 @@ Created 2013-03-16 Sunny Bains #ifndef dyn0buf_h #define dyn0buf_h -#include "univ.i" -#include "ut0lst.h" #include "mem0mem.h" #include "dyn0types.h" +#include "ut0lst.h" /** Class that manages dynamic buffers. It uses a UT_LIST of dyn_buf_t::block_t instances. We don't use STL containers in diff --git a/storage/innobase/include/eval0eval.h b/storage/innobase/include/eval0eval.h index 2e20c634c3b..348d71af8f4 100644 --- a/storage/innobase/include/eval0eval.h +++ b/storage/innobase/include/eval0eval.h @@ -27,7 +27,6 @@ Created 12/29/1997 Heikki Tuuri #ifndef eval0eval_h #define eval0eval_h -#include "univ.i" #include "que0types.h" #include "pars0sym.h" #include "pars0pars.h" diff --git a/storage/innobase/include/eval0proc.h b/storage/innobase/include/eval0proc.h index b359bf06ce0..4bab9b7bc34 100644 --- a/storage/innobase/include/eval0proc.h +++ b/storage/innobase/include/eval0proc.h @@ -26,7 +26,6 @@ Created 1/20/1998 Heikki Tuuri #ifndef eval0proc_h #define eval0proc_h -#include "univ.i" #include "que0types.h" #include "pars0sym.h" #include "pars0pars.h" diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 6406ff8448c..46faa3e90b2 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -26,7 +26,6 @@ Created 10/25/1995 Heikki Tuuri #ifndef fil0fil_h #define fil0fil_h -#include "univ.i" #ifndef UNIV_INNOCHECKSUM @@ -453,6 +452,8 @@ enum fil_encryption_t { FIL_ENCRYPTION_OFF }; +#ifndef UNIV_INNOCHECKSUM + /** The number of fsyncs done to the log */ extern ulint fil_n_log_flushes; @@ -461,8 +462,6 @@ extern ulint fil_n_pending_log_flushes; /** Number of pending tablespace flushes */ extern ulint fil_n_pending_tablespace_flushes; -#ifndef UNIV_INNOCHECKSUM - /** Look up a tablespace. The caller should hold an InnoDB table lock or a MDL that prevents the tablespace from being dropped during the operation, diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h index af60383b0ca..8b9bbba5239 100644 --- a/storage/innobase/include/fsp0fsp.h +++ b/storage/innobase/include/fsp0fsp.h @@ -27,8 +27,6 @@ Created 12/18/1995 Heikki Tuuri #ifndef fsp0fsp_h #define fsp0fsp_h -#include "univ.i" - #include "fsp0types.h" #ifndef UNIV_INNOCHECKSUM @@ -40,7 +38,6 @@ Created 12/18/1995 Heikki Tuuri #include "ut0byte.h" #endif /* !UNIV_INNOCHECKSUM */ -#include "fsp0types.h" /** @return the PAGE_SSIZE flags for the current innodb_page_size */ #define FSP_FLAGS_PAGE_SSIZE() \ diff --git a/storage/innobase/include/fsp0types.h b/storage/innobase/include/fsp0types.h index c6dbe52def4..92ba956e30b 100644 --- a/storage/innobase/include/fsp0types.h +++ b/storage/innobase/include/fsp0types.h @@ -27,6 +27,8 @@ Created May 26, 2009 Vasil Dimov #ifndef fsp0types_h #define fsp0types_h +#include "univ.i" + #ifndef UNIV_INNOCHECKSUM /** The fil_space_t::id of the redo log. All persistent tablespaces @@ -35,7 +37,6 @@ have a smaller fil_space_t::id. */ /** The fil_space_t::id of the innodb_temporary tablespace. */ #define SRV_TMP_SPACE_ID 0xFFFFFFFEU -#include "univ.i" #include "ut0byte.h" /** @name Flags for inserting records in order diff --git a/storage/innobase/include/fts0fts.h b/storage/innobase/include/fts0fts.h index ce628438cb0..82431c76b51 100644 --- a/storage/innobase/include/fts0fts.h +++ b/storage/innobase/include/fts0fts.h @@ -29,8 +29,6 @@ Created 2011/09/02 Sunny Bains #include "data0type.h" #include "data0types.h" -#include "dict0types.h" -#include "hash0hash.h" #include "mem0mem.h" #include "rem0types.h" #include "row0types.h" diff --git a/storage/innobase/include/fts0priv.h b/storage/innobase/include/fts0priv.h index fca22bdc7d6..59e6311f7d4 100644 --- a/storage/innobase/include/fts0priv.h +++ b/storage/innobase/include/fts0priv.h @@ -27,7 +27,6 @@ Created 2011/09/02 Sunny Bains #ifndef INNOBASE_FTS0PRIV_H #define INNOBASE_FTS0PRIV_H -#include "univ.i" #include "dict0dict.h" #include "pars0pars.h" #include "que0que.h" diff --git a/storage/innobase/include/fts0types.h b/storage/innobase/include/fts0types.h index 0bcb8d5a1d3..88d2d2bd0f2 100644 --- a/storage/innobase/include/fts0types.h +++ b/storage/innobase/include/fts0types.h @@ -27,7 +27,6 @@ Created 2007-03-27 Sunny Bains #ifndef INNOBASE_FTS0TYPES_H #define INNOBASE_FTS0TYPES_H -#include "univ.i" #include "fts0fts.h" #include "fut0fut.h" #include "pars0pars.h" diff --git a/storage/innobase/include/fut0fut.h b/storage/innobase/include/fut0fut.h index 82882444291..497b6ac5114 100644 --- a/storage/innobase/include/fut0fut.h +++ b/storage/innobase/include/fut0fut.h @@ -27,8 +27,6 @@ Created 12/13/1995 Heikki Tuuri #ifndef fut0fut_h #define fut0fut_h -#include "univ.i" - #include "fil0fil.h" #include "mtr0mtr.h" diff --git a/storage/innobase/include/fut0lst.h b/storage/innobase/include/fut0lst.h index bff4a92f381..092889fc42c 100644 --- a/storage/innobase/include/fut0lst.h +++ b/storage/innobase/include/fut0lst.h @@ -28,8 +28,6 @@ Created 11/28/1995 Heikki Tuuri #ifndef UNIV_INNOCHECKSUM -#include "univ.i" - #include "fil0fil.h" #include "mtr0mtr.h" diff --git a/storage/innobase/include/gis0rtree.h b/storage/innobase/include/gis0rtree.h index 65a53ec1d39..44e00b3abd6 100644 --- a/storage/innobase/include/gis0rtree.h +++ b/storage/innobase/include/gis0rtree.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2018, 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 @@ -27,23 +27,6 @@ Created 2013/03/27 Jimmy Yang and Allen Lai #ifndef gis0rtree_h #define gis0rtree_h -#include "univ.i" - -#include "data0type.h" -#include "data0types.h" -#include "dict0types.h" -#include "hash0hash.h" -#include "mem0mem.h" -#include "page0page.h" -#include "rem0types.h" -#include "row0types.h" -#include "trx0types.h" -#include "ut0vec.h" -#include "ut0wqueue.h" -#include "que0types.h" -#include "gis0geo.h" -#include "gis0type.h" -#include "btr0types.h" #include "btr0cur.h" /* Whether MBR 'a' contains 'b' */ diff --git a/storage/innobase/include/gis0type.h b/storage/innobase/include/gis0type.h index 887b06f3613..52add38b811 100644 --- a/storage/innobase/include/gis0type.h +++ b/storage/innobase/include/gis0type.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2018, 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 @@ -30,14 +31,7 @@ Created 2013/03/27 Jimmy Yang #include "data0type.h" #include "data0types.h" #include "dict0types.h" -#include "hash0hash.h" -#include "mem0mem.h" -#include "rem0types.h" -#include "row0types.h" -#include "trx0types.h" #include "ut0vec.h" -#include "ut0wqueue.h" -#include "que0types.h" #include "gis0geo.h" #include <vector> diff --git a/storage/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h index f5be654f490..060d36b2de1 100644 --- a/storage/innobase/include/ha0ha.h +++ b/storage/innobase/include/ha0ha.h @@ -27,8 +27,6 @@ Created 8/18/1994 Heikki Tuuri #ifndef ha0ha_h #define ha0ha_h -#include "univ.i" - #include "hash0hash.h" #include "page0types.h" #include "buf0types.h" diff --git a/storage/innobase/include/ha0storage.ic b/storage/innobase/include/ha0storage.ic index e841925d320..ebd788deda8 100644 --- a/storage/innobase/include/ha0storage.ic +++ b/storage/innobase/include/ha0storage.ic @@ -25,8 +25,6 @@ its own storage, avoiding duplicates. Created September 24, 2007 Vasil Dimov *******************************************************/ -#include "univ.i" -#include "ha0storage.h" #include "hash0hash.h" #include "mem0mem.h" diff --git a/storage/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h index cbb6da488b5..6afdf337aff 100644 --- a/storage/innobase/include/hash0hash.h +++ b/storage/innobase/include/hash0hash.h @@ -27,7 +27,6 @@ Created 5/20/1997 Heikki Tuuri #ifndef hash0hash_h #define hash0hash_h -#include "univ.i" #include "mem0mem.h" #include "sync0rw.h" diff --git a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h index 8b30f812323..ef72081c7cd 100644 --- a/storage/innobase/include/ibuf0ibuf.h +++ b/storage/innobase/include/ibuf0ibuf.h @@ -27,8 +27,6 @@ Created 7/19/1997 Heikki Tuuri #ifndef ibuf0ibuf_h #define ibuf0ibuf_h -#include "univ.i" - #include "mtr0mtr.h" #include "dict0mem.h" #include "fsp0fsp.h" diff --git a/storage/innobase/include/lock0iter.h b/storage/innobase/include/lock0iter.h index ca97d22556a..7b475116857 100644 --- a/storage/innobase/include/lock0iter.h +++ b/storage/innobase/include/lock0iter.h @@ -26,7 +26,6 @@ Created July 16, 2007 Vasil Dimov #ifndef lock0iter_h #define lock0iter_h -#include "univ.i" #include "lock0types.h" struct lock_queue_iterator_t { diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index 45f69cad9a5..79fb30eb3f5 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -27,12 +27,10 @@ Created 5/7/1996 Heikki Tuuri #ifndef lock0lock_h #define lock0lock_h -#include "univ.i" #include "buf0types.h" #include "trx0types.h" #include "mtr0types.h" #include "rem0types.h" -#include "dict0types.h" #include "que0types.h" #include "lock0types.h" #include "hash0hash.h" diff --git a/storage/innobase/include/lock0prdt.h b/storage/innobase/include/lock0prdt.h index e4e37776d22..1fa7796794a 100644 --- a/storage/innobase/include/lock0prdt.h +++ b/storage/innobase/include/lock0prdt.h @@ -26,7 +26,6 @@ Created 9/7/2013 Jimmy Yang #ifndef lock0prdt_h #define lock0prdt_h -#include "univ.i" #include "lock0lock.h" /* Predicate lock data */ diff --git a/storage/innobase/include/lock0priv.h b/storage/innobase/include/lock0priv.h index d9377e97d40..ab88f065809 100644 --- a/storage/innobase/include/lock0priv.h +++ b/storage/innobase/include/lock0priv.h @@ -34,7 +34,6 @@ those functions in lock/ */ #error Do not include lock0priv.h outside of the lock/ module #endif -#include "univ.i" #include "hash0hash.h" #include "trx0trx.h" diff --git a/storage/innobase/include/lock0types.h b/storage/innobase/include/lock0types.h index 1a03d1d0297..f32cb9d4815 100644 --- a/storage/innobase/include/lock0types.h +++ b/storage/innobase/include/lock0types.h @@ -24,6 +24,7 @@ The transaction lock system global types Created 5/7/1996 Heikki Tuuri *******************************************************/ +#include "dict0types.h" #include "ut0lst.h" #ifndef lock0types_h diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h index 4ff0056444b..336e33fccad 100644 --- a/storage/innobase/include/log0log.h +++ b/storage/innobase/include/log0log.h @@ -34,7 +34,6 @@ Created 12/9/1995 Heikki Tuuri #ifndef log0log_h #define log0log_h -#include "univ.i" #include "dyn0buf.h" #include "sync0rw.h" #include "log0types.h" diff --git a/storage/innobase/include/mach0data.h b/storage/innobase/include/mach0data.h index 684a3155a16..bcf71ea6b17 100644 --- a/storage/innobase/include/mach0data.h +++ b/storage/innobase/include/mach0data.h @@ -28,9 +28,10 @@ Created 11/28/1995 Heikki Tuuri #ifndef mach0data_h #define mach0data_h +#include "univ.i" + #ifndef UNIV_INNOCHECKSUM -#include "univ.i" #include "mtr0types.h" /* The data and all fields are always stored in a database file diff --git a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h index e1cd24a26c6..0ae784a58d0 100644 --- a/storage/innobase/include/mem0mem.h +++ b/storage/innobase/include/mem0mem.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2018, 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 @@ -27,9 +27,7 @@ Created 6/9/1994 Heikki Tuuri #ifndef mem0mem_h #define mem0mem_h -#include "univ.i" #include "ut0mem.h" -#include "ut0byte.h" #include "ut0rnd.h" #include "mach0data.h" diff --git a/storage/innobase/include/mtr0log.h b/storage/innobase/include/mtr0log.h index d6b32374c42..d2de11b3470 100644 --- a/storage/innobase/include/mtr0log.h +++ b/storage/innobase/include/mtr0log.h @@ -26,7 +26,6 @@ Created 12/7/1995 Heikki Tuuri #ifndef mtr0log_h #define mtr0log_h -#include "univ.i" #include "mtr0mtr.h" #include "dyn0buf.h" diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h index 4c00b07c0cc..5a7df35c372 100644 --- a/storage/innobase/include/mtr0mtr.h +++ b/storage/innobase/include/mtr0mtr.h @@ -28,7 +28,6 @@ Created 11/26/1995 Heikki Tuuri #ifndef mtr0mtr_h #define mtr0mtr_h -#include "univ.i" #include "log0types.h" #include "mtr0types.h" #include "buf0types.h" diff --git a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic index a7e4f2695da..9e79267ab2e 100644 --- a/storage/innobase/include/os0file.ic +++ b/storage/innobase/include/os0file.ic @@ -24,8 +24,6 @@ The interface to the operating system file io Created 2/20/2010 Jimmy Yang *******************************************************/ -#include "univ.i" - #ifdef UNIV_PFS_IO /** NOTE! Please use the corresponding macro os_file_create_simple(), not directly this function! diff --git a/storage/innobase/include/os0once.h b/storage/innobase/include/os0once.h index 05a45a69f33..dda16af605e 100644 --- a/storage/innobase/include/os0once.h +++ b/storage/innobase/include/os0once.h @@ -28,7 +28,6 @@ Created Feb 20, 2014 Vasil Dimov #define os0once_h #include "univ.i" - #include "ut0ut.h" /** Execute a given function exactly once in a multi-threaded environment diff --git a/storage/innobase/include/page0cur.h b/storage/innobase/include/page0cur.h index a038f68731c..3adbfeb93ec 100644 --- a/storage/innobase/include/page0cur.h +++ b/storage/innobase/include/page0cur.h @@ -27,8 +27,6 @@ Created 10/4/1994 Heikki Tuuri #ifndef page0cur_h #define page0cur_h -#include "univ.i" - #include "buf0types.h" #include "page0page.h" #include "rem0rec.h" @@ -36,7 +34,6 @@ Created 10/4/1994 Heikki Tuuri #include "mtr0mtr.h" #include "gis0type.h" - #ifdef UNIV_DEBUG /*********************************************************//** Gets pointer to the page frame where the cursor is positioned. diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h index 9c86f64ccbd..d0c1737b16b 100644 --- a/storage/innobase/include/page0page.h +++ b/storage/innobase/include/page0page.h @@ -26,8 +26,6 @@ Created 2/2/1994 Heikki Tuuri #ifndef page0page_h #define page0page_h -#include "univ.i" - #include "page0types.h" #ifndef UNIV_INNOCHECKSUM #include "fil0fil.h" diff --git a/storage/innobase/include/page0size.h b/storage/innobase/include/page0size.h index 30a996df0a6..24b70d13bd0 100644 --- a/storage/innobase/include/page0size.h +++ b/storage/innobase/include/page0size.h @@ -27,7 +27,6 @@ Created Nov 14, 2013 Vasil Dimov #ifndef page0size_t #define page0size_t -#include "univ.i" #include "fsp0types.h" #define FIELD_REF_SIZE 20 diff --git a/storage/innobase/include/page0types.h b/storage/innobase/include/page0types.h index 53a03466dde..47d66df2758 100644 --- a/storage/innobase/include/page0types.h +++ b/storage/innobase/include/page0types.h @@ -26,7 +26,6 @@ Created 2/2/1994 Heikki Tuuri #ifndef page0types_h #define page0types_h -#include "univ.i" #include "dict0types.h" #include "mtr0types.h" diff --git a/storage/innobase/include/page0zip.h b/storage/innobase/include/page0zip.h index c1d5443d9e5..d72d5662f78 100644 --- a/storage/innobase/include/page0zip.h +++ b/storage/innobase/include/page0zip.h @@ -34,7 +34,6 @@ Created June 2005 by Marko Makela #endif #ifdef UNIV_INNOCHECKSUM -#include "univ.i" #include "buf0buf.h" #include "ut0crc32.h" #include "buf0checksum.h" diff --git a/storage/innobase/include/pars0opt.h b/storage/innobase/include/pars0opt.h index d9debcf325e..3d5468b8a5e 100644 --- a/storage/innobase/include/pars0opt.h +++ b/storage/innobase/include/pars0opt.h @@ -27,10 +27,8 @@ Created 12/21/1997 Heikki Tuuri #ifndef pars0opt_h #define pars0opt_h -#include "univ.i" #include "que0types.h" #include "pars0sym.h" -#include "dict0types.h" #include "row0sel.h" /*******************************************************************//** diff --git a/storage/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h index 37498c1c638..a476d7d1d45 100644 --- a/storage/innobase/include/pars0pars.h +++ b/storage/innobase/include/pars0pars.h @@ -27,7 +27,6 @@ Created 11/19/1996 Heikki Tuuri #ifndef pars0pars_h #define pars0pars_h -#include "univ.i" #include "que0types.h" #include "pars0types.h" #include "row0types.h" diff --git a/storage/innobase/include/pars0sym.h b/storage/innobase/include/pars0sym.h index 920087b96c2..c9a5bb5fac2 100644 --- a/storage/innobase/include/pars0sym.h +++ b/storage/innobase/include/pars0sym.h @@ -27,9 +27,7 @@ Created 12/15/1997 Heikki Tuuri #ifndef pars0sym_h #define pars0sym_h -#include "univ.i" #include "que0types.h" -#include "dict0types.h" #include "pars0types.h" #include "row0types.h" diff --git a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h index f01b596a52e..cf8e48be0af 100644 --- a/storage/innobase/include/que0que.h +++ b/storage/innobase/include/que0que.h @@ -27,9 +27,7 @@ Created 5/27/1996 Heikki Tuuri #ifndef que0que_h #define que0que_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" #include "trx0trx.h" #include "trx0roll.h" #include "srv0srv.h" diff --git a/storage/innobase/include/que0types.h b/storage/innobase/include/que0types.h index 0f11cad301a..017e5df9a6f 100644 --- a/storage/innobase/include/que0types.h +++ b/storage/innobase/include/que0types.h @@ -27,7 +27,6 @@ Created 5/27/1996 Heikki Tuuri #define que0types_h #include "data0data.h" -#include "dict0types.h" /* Pseudotype for all graph nodes */ typedef void que_node_t; diff --git a/storage/innobase/include/read0read.h b/storage/innobase/include/read0read.h index 129341be77c..770d444e69a 100644 --- a/storage/innobase/include/read0read.h +++ b/storage/innobase/include/read0read.h @@ -26,8 +26,6 @@ Created 2/16/1997 Heikki Tuuri #ifndef read0read_h #define read0read_h -#include "univ.i" - #include "read0types.h" #include <algorithm> diff --git a/storage/innobase/include/read0types.h b/storage/innobase/include/read0types.h index c83c7e04f11..c51a3744398 100644 --- a/storage/innobase/include/read0types.h +++ b/storage/innobase/include/read0types.h @@ -26,10 +26,9 @@ Created 2/16/1997 Heikki Tuuri #ifndef read0types_h #define read0types_h -#include <algorithm> #include "dict0mem.h" - #include "trx0types.h" +#include <algorithm> // Friend declaration class MVCC; diff --git a/storage/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h index 899624a003e..e7030915292 100644 --- a/storage/innobase/include/rem0cmp.h +++ b/storage/innobase/include/rem0cmp.h @@ -29,7 +29,6 @@ Created 7/1/1994 Heikki Tuuri #include "data0data.h" #include "data0type.h" -#include "dict0types.h" #include "rem0types.h" #include "page0types.h" diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h index 3b1f1c7f742..5c571df9563 100644 --- a/storage/innobase/include/rem0rec.h +++ b/storage/innobase/include/rem0rec.h @@ -28,7 +28,6 @@ Created 5/30/1994 Heikki Tuuri #define rem0rec_h #ifndef UNIV_INNOCHECKSUM -#include "univ.i" #include "data0data.h" #include "rem0types.h" #include "mtr0types.h" diff --git a/storage/innobase/include/row0ext.h b/storage/innobase/include/row0ext.h index 050bc37850b..fe4bd710156 100644 --- a/storage/innobase/include/row0ext.h +++ b/storage/innobase/include/row0ext.h @@ -26,12 +26,11 @@ Created September 2006 Marko Makela #ifndef row0ext_h #define row0ext_h -#include "univ.i" -#include "row0types.h" #include "data0types.h" #include "mem0mem.h" #include "dict0types.h" #include "page0size.h" +#include "row0types.h" /********************************************************************//** Creates a cache of column prefixes of externally stored columns. diff --git a/storage/innobase/include/row0ftsort.h b/storage/innobase/include/row0ftsort.h index 8f7632ed9ac..58b4c817acf 100644 --- a/storage/innobase/include/row0ftsort.h +++ b/storage/innobase/include/row0ftsort.h @@ -27,16 +27,11 @@ Created 10/13/2010 Jimmy Yang #ifndef row0ftsort_h #define row0ftsort_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" -#include "row0mysql.h" #include "fts0fts.h" -#include "fts0types.h" #include "fts0priv.h" #include "row0merge.h" #include "btr0bulk.h" -#include "os0thread.h" /** This structure defineds information the scan thread will fetch and put to the linked list for parallel tokenization/sort threads diff --git a/storage/innobase/include/row0import.h b/storage/innobase/include/row0import.h index c6dfca9d7e8..12fe6b4f5d2 100644 --- a/storage/innobase/include/row0import.h +++ b/storage/innobase/include/row0import.h @@ -27,7 +27,6 @@ Created 2012-02-08 by Sunny Bains #ifndef row0import_h #define row0import_h -#include "univ.i" #include "dict0types.h" // Forward declarations diff --git a/storage/innobase/include/row0ins.h b/storage/innobase/include/row0ins.h index a7320f9ed03..05f16d28327 100644 --- a/storage/innobase/include/row0ins.h +++ b/storage/innobase/include/row0ins.h @@ -27,10 +27,8 @@ Created 4/20/1996 Heikki Tuuri #ifndef row0ins_h #define row0ins_h -#include "univ.i" #include "data0data.h" #include "que0types.h" -#include "dict0types.h" #include "trx0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0log.h b/storage/innobase/include/row0log.h index c52beb495da..e17ec1b8569 100644 --- a/storage/innobase/include/row0log.h +++ b/storage/innobase/include/row0log.h @@ -27,14 +27,12 @@ Created 2011-05-26 Marko Makela #ifndef row0log_h #define row0log_h -#include "univ.i" +#include "que0types.h" #include "mtr0types.h" #include "row0types.h" #include "rem0types.h" #include "data0types.h" -#include "dict0types.h" #include "trx0types.h" -#include "que0types.h" class ut_stage_alter_t; diff --git a/storage/innobase/include/row0merge.h b/storage/innobase/include/row0merge.h index 51ad5cc5cd7..f1bb45d76d9 100644 --- a/storage/innobase/include/row0merge.h +++ b/storage/innobase/include/row0merge.h @@ -27,11 +27,8 @@ Created 13/06/2005 Jan Lindstrom #ifndef row0merge_h #define row0merge_h -#include "univ.i" -#include "data0data.h" -#include "dict0types.h" -#include "trx0types.h" #include "que0types.h" +#include "trx0types.h" #include "mtr0mtr.h" #include "rem0types.h" #include "rem0rec.h" diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h index 05b1f2e5dac..546540ac640 100644 --- a/storage/innobase/include/row0mysql.h +++ b/storage/innobase/include/row0mysql.h @@ -28,9 +28,7 @@ Created 9/17/2000 Heikki Tuuri #ifndef row0mysql_h #define row0mysql_h -#include "data0data.h" #include "que0types.h" -#include "dict0types.h" #include "trx0types.h" #include "row0types.h" #include "btr0types.h" diff --git a/storage/innobase/include/row0purge.h b/storage/innobase/include/row0purge.h index 655685c02a8..ceb4a34cd72 100644 --- a/storage/innobase/include/row0purge.h +++ b/storage/innobase/include/row0purge.h @@ -27,13 +27,10 @@ Created 3/14/1997 Heikki Tuuri #ifndef row0purge_h #define row0purge_h -#include "univ.i" -#include "data0data.h" +#include "que0types.h" #include "btr0types.h" #include "btr0pcur.h" -#include "dict0types.h" #include "trx0types.h" -#include "que0types.h" #include "row0types.h" #include "ut0vec.h" #include "row0mysql.h" diff --git a/storage/innobase/include/row0quiesce.h b/storage/innobase/include/row0quiesce.h index 4519e2487ce..de267f17405 100644 --- a/storage/innobase/include/row0quiesce.h +++ b/storage/innobase/include/row0quiesce.h @@ -28,7 +28,6 @@ Created 2012-02-08 by Sunny Bains #ifndef row0quiesce_h #define row0quiesce_h -#include "univ.i" #include "dict0types.h" struct trx_t; diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h index d24ae37b13d..d4381e55096 100644 --- a/storage/innobase/include/row0row.h +++ b/storage/innobase/include/row0row.h @@ -27,12 +27,9 @@ Created 4/20/1996 Heikki Tuuri #ifndef row0row_h #define row0row_h -#include "univ.i" -#include "data0data.h" -#include "dict0types.h" +#include "que0types.h" #include "ibuf0ibuf.h" #include "trx0types.h" -#include "que0types.h" #include "mtr0mtr.h" #include "rem0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h index 552680b16d1..ab20f9bd6bf 100644 --- a/storage/innobase/include/row0sel.h +++ b/storage/innobase/include/row0sel.h @@ -27,10 +27,8 @@ Created 12/19/1997 Heikki Tuuri #ifndef row0sel_h #define row0sel_h -#include "univ.i" #include "data0data.h" #include "que0types.h" -#include "dict0types.h" #include "trx0types.h" #include "read0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0uins.h b/storage/innobase/include/row0uins.h index 15e6c33e55e..3d349287bc3 100644 --- a/storage/innobase/include/row0uins.h +++ b/storage/innobase/include/row0uins.h @@ -27,9 +27,7 @@ Created 2/25/1997 Heikki Tuuri #ifndef row0uins_h #define row0uins_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" #include "trx0types.h" #include "que0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0umod.h b/storage/innobase/include/row0umod.h index ef2dd491efd..59d53f60783 100644 --- a/storage/innobase/include/row0umod.h +++ b/storage/innobase/include/row0umod.h @@ -27,9 +27,7 @@ Created 2/27/1997 Heikki Tuuri #ifndef row0umod_h #define row0umod_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" #include "trx0types.h" #include "que0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h index 730e7f559c6..abf4f61329a 100644 --- a/storage/innobase/include/row0undo.h +++ b/storage/innobase/include/row0undo.h @@ -27,13 +27,9 @@ Created 1/8/1997 Heikki Tuuri #ifndef row0undo_h #define row0undo_h -#include "univ.i" -#include "mtr0mtr.h" #include "trx0sys.h" #include "btr0types.h" #include "btr0pcur.h" -#include "dict0types.h" -#include "trx0types.h" #include "que0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0upd.h b/storage/innobase/include/row0upd.h index 77708d7d568..9686f8d6896 100644 --- a/storage/innobase/include/row0upd.h +++ b/storage/innobase/include/row0upd.h @@ -27,11 +27,9 @@ Created 12/27/1996 Heikki Tuuri #ifndef row0upd_h #define row0upd_h -#include "univ.i" #include "data0data.h" #include "row0types.h" #include "btr0types.h" -#include "dict0types.h" #include "trx0types.h" #include "btr0pcur.h" #include "que0types.h" diff --git a/storage/innobase/include/row0vers.h b/storage/innobase/include/row0vers.h index 23c2e8546bc..ac03478e083 100644 --- a/storage/innobase/include/row0vers.h +++ b/storage/innobase/include/row0vers.h @@ -27,9 +27,7 @@ Created 2/6/1997 Heikki Tuuri #ifndef row0vers_h #define row0vers_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" #include "trx0types.h" #include "que0types.h" #include "rem0types.h" diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 7ad5d2f2183..20206f9d9eb 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -42,20 +42,17 @@ Created 10/10/1995 Heikki Tuuri #ifndef srv0srv_h #define srv0srv_h -#include "univ.i" - -#include "mysql/psi/mysql_stage.h" -#include "mysql/psi/psi.h" - #include "log0log.h" #include "os0event.h" #include "que0types.h" #include "trx0types.h" #include "srv0conc.h" #include "buf0checksum.h" -#include "ut0counter.h" #include "fil0fil.h" +#include "mysql/psi/mysql_stage.h" +#include "mysql/psi/psi.h" + /** Global counters used inside InnoDB. */ struct srv_stats_t { diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h index 3575f2e40b9..54876d686a5 100644 --- a/storage/innobase/include/srv0start.h +++ b/storage/innobase/include/srv0start.h @@ -27,7 +27,6 @@ Created 10/10/1995 Heikki Tuuri #ifndef srv0start_h #define srv0start_h -#include "univ.i" #include "log0log.h" #include "ut0byte.h" diff --git a/storage/innobase/include/sync0arr.h b/storage/innobase/include/sync0arr.h index 4104e594cf9..83c40e50173 100644 --- a/storage/innobase/include/sync0arr.h +++ b/storage/innobase/include/sync0arr.h @@ -28,7 +28,6 @@ Created 9/5/1995 Heikki Tuuri #define sync0arr_h #include "univ.i" -#include "os0thread.h" /** Synchronization wait array cell */ struct sync_cell_t; diff --git a/storage/innobase/include/sync0debug.h b/storage/innobase/include/sync0debug.h index ecc742918f0..ccd5b9c2321 100644 --- a/storage/innobase/include/sync0debug.h +++ b/storage/innobase/include/sync0debug.h @@ -34,7 +34,6 @@ Created 2012-08-21 Sunny Bains #define sync0debug_h #include "univ.i" -#include "sync0types.h" /** Initializes the synchronization data structures. */ void diff --git a/storage/innobase/include/sync0policy.h b/storage/innobase/include/sync0policy.h index de27c87816c..0ea84aefcb7 100644 --- a/storage/innobase/include/sync0policy.h +++ b/storage/innobase/include/sync0policy.h @@ -27,10 +27,8 @@ Created 2012-08-21 Sunny Bains. #ifndef sync0policy_h #define sync0policy_h -#include "univ.i" #include "ut0rnd.h" #include "os0thread.h" -#include "sync0types.h" #include "srv0mon.h" #ifdef UNIV_DEBUG diff --git a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h index 888a32007ce..9dfe76c3348 100644 --- a/storage/innobase/include/sync0rw.h +++ b/storage/innobase/include/sync0rw.h @@ -34,8 +34,6 @@ Created 9/11/1995 Heikki Tuuri #ifndef sync0rw_h #define sync0rw_h -#include "univ.i" -#include "ut0counter.h" #include "os0event.h" #include "ut0mutex.h" diff --git a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h index 3c40591e873..5ec967507b9 100644 --- a/storage/innobase/include/sync0sync.h +++ b/storage/innobase/include/sync0sync.h @@ -35,7 +35,6 @@ Created 9/5/1995 Heikki Tuuri #define sync0sync_h #include "univ.i" -#include "ut0counter.h" #if defined UNIV_PFS_MUTEX || defined UNIV_PFS_RWLOCK diff --git a/storage/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h index 19f992f5f50..13c9e8fbabc 100644 --- a/storage/innobase/include/sync0types.h +++ b/storage/innobase/include/sync0types.h @@ -28,11 +28,9 @@ Created 9/5/1995 Heikki Tuuri #define sync0types_h #include <vector> -#include <iostream> #include <my_atomic.h> #include "ut0new.h" -#include "ut0counter.h" #ifdef _WIN32 /** Native mutex */ diff --git a/storage/innobase/include/trx0i_s.h b/storage/innobase/include/trx0i_s.h index e02c5d88a29..9eb19ec06c2 100644 --- a/storage/innobase/include/trx0i_s.h +++ b/storage/innobase/include/trx0i_s.h @@ -29,7 +29,6 @@ Created July 17, 2007 Vasil Dimov #ifndef trx0i_s_h #define trx0i_s_h -#include "univ.i" #include "trx0types.h" #include "dict0types.h" diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h index 5aae3a530f7..c6085b312a5 100644 --- a/storage/innobase/include/trx0purge.h +++ b/storage/innobase/include/trx0purge.h @@ -27,14 +27,9 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0purge_h #define trx0purge_h -#include "univ.i" -#include "trx0types.h" -#include "mtr0mtr.h" #include "trx0sys.h" #include "que0types.h" #include "page0page.h" -#include "fil0fil.h" -#include "read0types.h" #include <queue> diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h index 80a12a48453..ea6269b5ba4 100644 --- a/storage/innobase/include/trx0rec.h +++ b/storage/innobase/include/trx0rec.h @@ -27,12 +27,9 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0rec_h #define trx0rec_h -#include "univ.i" #include "trx0types.h" #include "row0types.h" #include "mtr0mtr.h" -#include "dict0types.h" -#include "data0data.h" #include "rem0types.h" #include "page0types.h" #include "row0log.h" diff --git a/storage/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h index 66e6f137b5a..d6fe576da90 100644 --- a/storage/innobase/include/trx0roll.h +++ b/storage/innobase/include/trx0roll.h @@ -27,9 +27,7 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0roll_h #define trx0roll_h -#include "univ.i" #include "trx0trx.h" -#include "trx0types.h" #include "mtr0mtr.h" #include "trx0sys.h" diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h index e1bc4850a61..519ef835fba 100644 --- a/storage/innobase/include/trx0sys.h +++ b/storage/innobase/include/trx0sys.h @@ -27,8 +27,6 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0sys_h #define trx0sys_h -#include "univ.i" - #include "buf0buf.h" #include "fil0fil.h" #include "trx0types.h" diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 440f4101c5c..8fde5689e40 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -27,9 +27,7 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0trx_h #define trx0trx_h -#include "dict0types.h" #include "trx0types.h" - #include "lock0types.h" #include "que0types.h" #include "mem0mem.h" diff --git a/storage/innobase/include/ut0counter.h b/storage/innobase/include/ut0counter.h index 6e36f117fff..ab694386099 100644 --- a/storage/innobase/include/ut0counter.h +++ b/storage/innobase/include/ut0counter.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2012, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2018, 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 @@ -28,9 +28,8 @@ Created 2012/04/12 by Sunny Bains #ifndef ut0counter_h #define ut0counter_h -#include <my_rdtsc.h> -#include "univ.i" #include "os0thread.h" +#include "my_rdtsc.h" #include "my_atomic.h" /** CPU cache line size */ diff --git a/storage/innobase/include/ut0dbg.h b/storage/innobase/include/ut0dbg.h index fd9a064ba35..6622b7cd865 100644 --- a/storage/innobase/include/ut0dbg.h +++ b/storage/innobase/include/ut0dbg.h @@ -35,8 +35,6 @@ Created 1/30/1994 Heikki Tuuri /* Do not include univ.i because univ.i includes this. */ -#include "os0thread.h" - /*************************************************************//** Report a failed assertion. */ ATTRIBUTE_NORETURN ATTRIBUTE_COLD __attribute__((nonnull(2))) diff --git a/storage/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h index 9e94216f47b..c2c05767e07 100644 --- a/storage/innobase/include/ut0mem.h +++ b/storage/innobase/include/ut0mem.h @@ -26,7 +26,6 @@ Created 5/30/1994 Heikki Tuuri #ifndef ut0mem_h #define ut0mem_h -#include "univ.i" #include "os0event.h" #include "ut0mutex.h" diff --git a/storage/innobase/include/ut0rbt.h b/storage/innobase/include/ut0rbt.h index 2fea7187a65..829c9363473 100644 --- a/storage/innobase/include/ut0rbt.h +++ b/storage/innobase/include/ut0rbt.h @@ -26,7 +26,6 @@ Created 2007-03-20 Sunny Bains #define INNOBASE_UT0RBT_H #if !defined(IB_RBT_TESTING) -#include "univ.i" #include "ut0mem.h" #else #include <stdio.h> diff --git a/storage/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h index 49ae3c81356..2ee0d98924b 100644 --- a/storage/innobase/include/ut0rnd.h +++ b/storage/innobase/include/ut0rnd.h @@ -26,12 +26,9 @@ Created 1/20/1994 Heikki Tuuri #ifndef ut0rnd_h #define ut0rnd_h -#include "univ.i" - -#ifndef UNIV_INNOCHECKSUM - #include "ut0byte.h" +#ifndef UNIV_INNOCHECKSUM /** The 'character code' for end of field or string (used in folding records */ #define UT_END_OF_FIELD 257 diff --git a/storage/innobase/include/ut0sort.h b/storage/innobase/include/ut0sort.h index 75648b5c317..5b132f2bfbd 100644 --- a/storage/innobase/include/ut0sort.h +++ b/storage/innobase/include/ut0sort.h @@ -26,8 +26,6 @@ Created 11/9/1995 Heikki Tuuri #ifndef ut0sort_h #define ut0sort_h -#include "univ.i" - /* This module gives a macro definition of the body of a standard sort function for an array of elements of any type. The comparison function is given as a parameter to diff --git a/storage/innobase/include/ut0stage.h b/storage/innobase/include/ut0stage.h index 1d5457a3ab0..c39be3b90b5 100644 --- a/storage/innobase/include/ut0stage.h +++ b/storage/innobase/include/ut0stage.h @@ -35,8 +35,6 @@ Created Nov 12, 2014 Vasil Dimov #include "mysql/psi/mysql_stage.h" /* mysql_stage_inc_work_completed */ #include "mysql/psi/psi.h" /* HAVE_PSI_STAGE_INTERFACE, PSI_stage_progress */ -#include "univ.i" - #include "dict0mem.h" /* dict_index_t */ #include "row0log.h" /* row_log_estimate_work() */ #include "srv0srv.h" /* ut_stage_alter_t */ diff --git a/storage/innobase/include/ut0vec.h b/storage/innobase/include/ut0vec.h index 13b561a3a4f..c23b1844349 100644 --- a/storage/innobase/include/ut0vec.h +++ b/storage/innobase/include/ut0vec.h @@ -26,7 +26,6 @@ Created 4/6/2006 Osku Salerma #ifndef IB_VECTOR_H #define IB_VECTOR_H -#include "univ.i" #include "mem0mem.h" struct ib_alloc_t; diff --git a/storage/innobase/lock/lock0iter.cc b/storage/innobase/lock/lock0iter.cc index db30bcf1ca6..071031748b7 100644 --- a/storage/innobase/lock/lock0iter.cc +++ b/storage/innobase/lock/lock0iter.cc @@ -26,7 +26,6 @@ Created July 16, 2007 Vasil Dimov #define LOCK_MODULE_IMPLEMENTATION -#include "univ.i" #include "dict0mem.h" #include "lock0iter.h" #include "lock0lock.h" diff --git a/storage/innobase/os/os0thread.cc b/storage/innobase/os/os0thread.cc index e0d96276b55..19d91c43637 100644 --- a/storage/innobase/os/os0thread.cc +++ b/storage/innobase/os/os0thread.cc @@ -25,7 +25,6 @@ Created 9/8/1995 Heikki Tuuri *******************************************************/ #include "univ.i" -#include "os0thread.h" #include "srv0srv.h" /** Number of threads active. */ diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index 66807ced2c1..4fdc6581005 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -28,6 +28,7 @@ Created 2012-02-08 by Sunny Bains. #include "btr0pcur.h" #include "que0que.h" #include "dict0boot.h" +#include "dict0load.h" #include "ibuf0ibuf.h" #include "pars0pars.h" #include "row0upd.h" diff --git a/storage/innobase/row/row0trunc.cc b/storage/innobase/row/row0trunc.cc index c326a9468a0..ee90ceaf924 100644 --- a/storage/innobase/row/row0trunc.cc +++ b/storage/innobase/row/row0trunc.cc @@ -29,6 +29,7 @@ Created 2013-04-12 Sunny Bains #include "btr0pcur.h" #include "dict0crea.h" #include "dict0boot.h" +#include "dict0load.h" #include "dict0stats.h" #include "dict0stats_bg.h" #include "lock0lock.h" diff --git a/storage/innobase/sync/sync0sync.cc b/storage/innobase/sync/sync0sync.cc index 097f3143524..cccbf13dbf5 100644 --- a/storage/innobase/sync/sync0sync.cc +++ b/storage/innobase/sync/sync0sync.cc @@ -30,7 +30,6 @@ Mutex, the basic synchronization primitive Created 9/5/1995 Heikki Tuuri *******************************************************/ -#include "univ.i" #include "sync0rw.h" #include "sync0sync.h" diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc index 374c7b12db1..4a1598a77a3 100644 --- a/storage/innobase/trx/trx0i_s.cc +++ b/storage/innobase/trx/trx0i_s.cc @@ -29,13 +29,6 @@ table cache" for later retrieval. Created July 17, 2007 Vasil Dimov *******************************************************/ -/* Found during the build of 5.5.3 on Linux 2.4 and early 2.6 kernels: - The includes "univ.i" -> "my_global.h" cause a different path - to be taken further down with pthread functions and types, - so they must come first. - From the symptoms, this is related to bug#46587 in the MySQL bug DB. -*/ - #include "trx0i_s.h" #include "buf0buf.h" #include "dict0dict.h" diff --git a/storage/innobase/ut/ut0crc32.cc b/storage/innobase/ut/ut0crc32.cc index 4e80ca67562..cbb571e8f47 100644 --- a/storage/innobase/ut/ut0crc32.cc +++ b/storage/innobase/ut/ut0crc32.cc @@ -83,7 +83,6 @@ mysys/my_perf.c, contributed by Facebook under the following license. #include "my_config.h" #include <string.h> -#include "univ.i" #include "ut0crc32.h" #ifdef _MSC_VER |