mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 09:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_NONINL

Browse source 
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.
This commit is contained in:
Marko Mäkelä 2016-04-22 10:50:45 +02:00 • committed by Marko Mäkelä
commit 4e1116b2c6
190 changed files with 73 additions and 1201 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/for_clients.cmake
View file

@ -66,7 +66,7 @@ ENDMACRO()
# FIXME until we have a --cxxflags, we need to remove -AC99 # FIXME until we have a --cxxflags, we need to remove -AC99
# to make --cflags usable for HP C++ (aCC) # to make --cflags usable for HP C++ (aCC)
REPLACE_FOR_CLIENTS(CFLAGS "[DU]DBUG_OFF" "[DU]SAFE_MUTEX" "[DU]NDEBUG" REPLACE_FOR_CLIENTS(CFLAGS "[DU]DBUG_OFF" "[DU]SAFE_MUTEX" "[DU]NDEBUG"
"[DU]UNIV_MUST_NOT_INLINE" "[DU]FORCE_INIT_OF_VARS" "[DU]EXTRA_DEBUG" "[DU]HAVE_valgrind" "[DU]FORCE_INIT_OF_VARS" "[DU]EXTRA_DEBUG" "[DU]HAVE_valgrind"
"O" "O[0-9]" "xO[0-9]" "W[-A-Za-z]*" "mtune=[-A-Za-z0-9]*" "g" "fPIC" "O" "O[0-9]" "xO[0-9]" "W[-A-Za-z]*" "mtune=[-A-Za-z0-9]*" "g" "fPIC"
"mcpu=[-A-Za-z0-9]*" "unroll2" "ip" "mp" "march=[-A-Za-z0-9]*" "Xa" "mcpu=[-A-Za-z0-9]*" "unroll2" "ip" "mp" "march=[-A-Za-z0-9]*" "Xa"
"xstrconst" "xc99=none" "AC99" "restrict" "W[-A-Za-z]*=[-A-Za-z0-9]*") "xstrconst" "xc99=none" "AC99" "restrict" "W[-A-Za-z]*=[-A-Za-z0-9]*")

6
extra/innochecksum.cc
View file

@ -60,12 +60,6 @@ The parts not included are excluded by #ifndef UNIV_INNOCHECKSUM. */
#include "ut0byte.h" #include "ut0byte.h"
#include "mach0data.h" #include "mach0data.h"
#ifdef UNIV_NONINL
# include "fsp0fsp.ic"
# include "mach0data.ic"
# include "ut0rnd.ic"
#endif
#ifndef PRIuMAX #ifndef PRIuMAX
#define PRIuMAX "llu" #define PRIuMAX "llu"
#endif #endif

2
storage/innobase/CMakeLists.txt
View file

@ -71,7 +71,6 @@ SET(INNOBASE_SOURCES
fsp/fsp0file.cc fsp/fsp0file.cc
fsp/fsp0space.cc fsp/fsp0space.cc
fsp/fsp0sysspace.cc fsp/fsp0sysspace.cc
fut/fut0fut.cc
fut/fut0lst.cc fut/fut0lst.cc
ha/ha0ha.cc ha/ha0ha.cc
ha/ha0storage.cc ha/ha0storage.cc
@ -155,7 +154,6 @@ SET(INNOBASE_SOURCES
trx/trx0trx.cc trx/trx0trx.cc
trx/trx0undo.cc trx/trx0undo.cc
usr/usr0sess.cc usr/usr0sess.cc
ut/ut0byte.cc
ut/ut0crc32.cc ut/ut0crc32.cc
ut/ut0dbg.cc ut/ut0dbg.cc
ut/ut0list.cc ut/ut0list.cc

4
storage/innobase/btr/btr0btr.cc
View file

@ -28,10 +28,6 @@ Created 6/2/1994 Heikki Tuuri
#include "btr0btr.h" #include "btr0btr.h"
#include "ha_prototypes.h" #include "ha_prototypes.h"
#ifdef UNIV_NONINL
#include "btr0btr.ic"
#endif
#include "fsp0sysspace.h" #include "fsp0sysspace.h"
#include "page0page.h" #include "page0page.h"
#include "page0zip.h" #include "page0zip.h"

5
storage/innobase/btr/btr0cur.cc
View file

@ -44,11 +44,6 @@ Created 10/16/1994 Heikki Tuuri
*******************************************************/ *******************************************************/
#include "btr0cur.h" #include "btr0cur.h"
#ifdef UNIV_NONINL
#include "btr0cur.ic"
#endif
#include "row0upd.h" #include "row0upd.h"
#include "mtr0log.h" #include "mtr0log.h"
#include "page0page.h" #include "page0page.h"

7
storage/innobase/btr/btr0pcur.cc
View file

@ -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. Copyright (c) 2016, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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" #include "btr0pcur.h"
#ifdef UNIV_NONINL
#include "btr0pcur.ic"
#endif
#include "ut0byte.h" #include "ut0byte.h"
#include "rem0cmp.h" #include "rem0cmp.h"
#include "trx0trx.h" #include "trx0trx.h"

4
storage/innobase/btr/btr0sea.cc
View file

@ -33,10 +33,6 @@ Created 2/17/1996 Heikki Tuuri
#include "btr0sea.h" #include "btr0sea.h"
#ifdef BTR_CUR_HASH_ADAPT #ifdef BTR_CUR_HASH_ADAPT
#ifdef UNIV_NONINL
#include "btr0sea.ic"
#endif /* UNIV_NOINL */
#include "buf0buf.h" #include "buf0buf.h"
#include "page0page.h" #include "page0page.h"
#include "page0cur.h" #include "page0cur.h"

3
storage/innobase/buf/buf0buddy.cc
View file

@ -24,9 +24,6 @@ Created December 2006 by Marko Makela
*******************************************************/ *******************************************************/
#include "buf0buddy.h" #include "buf0buddy.h"
#ifdef UNIV_NONINL
# include "buf0buddy.ic"
#endif
#include "buf0buf.h" #include "buf0buf.h"
#include "buf0lru.h" #include "buf0lru.h"
#include "buf0flu.h" #include "buf0flu.h"

3
storage/innobase/buf/buf0buf.cc
View file

@ -37,9 +37,6 @@ Created 11/5/1995 Heikki Tuuri
#include "buf0buf.h" #include "buf0buf.h"
#include "os0api.h" #include "os0api.h"
#ifdef UNIV_NONINL
#include "buf0buf.ic"
#endif
#ifdef UNIV_INNOCHECKSUM #ifdef UNIV_INNOCHECKSUM
#include "string.h" #include "string.h"
#include "mach0data.h" #include "mach0data.h"

5
storage/innobase/buf/buf0dblwr.cc
View file

@ -26,11 +26,6 @@ Created 2011/12/19
#include "ha_prototypes.h" #include "ha_prototypes.h"
#include "buf0dblwr.h" #include "buf0dblwr.h"
#ifdef UNIV_NONINL
#include "buf0buf.ic"
#endif
#include "buf0buf.h" #include "buf0buf.h"
#include "buf0checksum.h" #include "buf0checksum.h"
#include "srv0start.h" #include "srv0start.h"

5
storage/innobase/buf/buf0flu.cc
View file

@ -30,11 +30,6 @@ Created 11/11/1995 Heikki Tuuri
#include <my_dbug.h> #include <my_dbug.h>
#include "buf0flu.h" #include "buf0flu.h"
#ifdef UNIV_NONINL
#include "buf0flu.ic"
#endif
#include "buf0buf.h" #include "buf0buf.h"
#include "buf0mtflu.h" #include "buf0mtflu.h"
#include "buf0checksum.h" #include "buf0checksum.h"

4
storage/innobase/buf/buf0lru.cc
View file

@ -24,10 +24,6 @@ Created 11/5/1995 Heikki Tuuri
*******************************************************/ *******************************************************/
#include "buf0lru.h" #include "buf0lru.h"
#ifdef UNIV_NONINL
#include "buf0lru.ic"
#endif /* UNIV_NOINL */
#include "ut0byte.h" #include "ut0byte.h"
#include "ut0rnd.h" #include "ut0rnd.h"
#include "sync0rw.h" #include "sync0rw.h"

5
storage/innobase/data/data0data.cc
View file

@ -27,11 +27,6 @@ Created 5/30/1994 Heikki Tuuri
#include "ha_prototypes.h" #include "ha_prototypes.h"
#include "data0data.h" #include "data0data.h"
#ifdef UNIV_NONINL
#include "data0data.ic"
#endif
#include "rem0rec.h" #include "rem0rec.h"
#include "rem0cmp.h" #include "rem0cmp.h"
#include "page0page.h" #include "page0page.h"

4
storage/innobase/data/data0type.cc
View file

@ -28,10 +28,6 @@ Created 1/16/1996 Heikki Tuuri
#include "data0type.h" #include "data0type.h"
#ifdef UNIV_NONINL
#include "data0type.ic"
#endif
/* At the database startup we store the default-charset collation number of /* 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 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 column definitions, or records in the insert buffer, we use this

7
storage/innobase/dict/dict0boot.cc
View file

@ -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. Copyright (c) 2016, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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 "ha_prototypes.h"
#include "dict0boot.h" #include "dict0boot.h"
#ifdef UNIV_NONINL
#include "dict0boot.ic"
#endif
#include "dict0crea.h" #include "dict0crea.h"
#include "btr0btr.h" #include "btr0btr.h"
#include "dict0load.h" #include "dict0load.h"

5
storage/innobase/dict/dict0crea.cc
View file

@ -26,11 +26,6 @@ Created 1/8/1996 Heikki Tuuri
#include "ha_prototypes.h" #include "ha_prototypes.h"
#include "dict0crea.h" #include "dict0crea.h"
#ifdef UNIV_NONINL
#include "dict0crea.ic"
#endif
#include "btr0pcur.h" #include "btr0pcur.h"
#include "btr0btr.h" #include "btr0btr.h"
#include "page0page.h" #include "page0page.h"

4
storage/innobase/dict/dict0defrag_bg.cc
View file

@ -31,10 +31,6 @@ Created 25/08/2016 Jan Lindström
#include "srv0start.h" #include "srv0start.h"
#include "ut0new.h" #include "ut0new.h"
#ifdef UNIV_NONINL
# include "dict0stats_bg.ic"
#endif
#include <vector> #include <vector>
static ib_mutex_t defrag_pool_mutex; static ib_mutex_t defrag_pool_mutex;

5
storage/innobase/dict/dict0dict.cc
View file

@ -37,11 +37,6 @@ Created 1/8/1996 Heikki Tuuri
#include "fil0fil.h" #include "fil0fil.h"
#include <algorithm> #include <algorithm>
#ifdef UNIV_NONINL
#include "dict0dict.ic"
#include "dict0priv.ic"
#endif
/** dummy index for ROW_FORMAT=REDUNDANT supremum and infimum records */ /** dummy index for ROW_FORMAT=REDUNDANT supremum and infimum records */
dict_index_t* dict_ind_redundant; dict_index_t* dict_ind_redundant;

3
storage/innobase/dict/dict0load.cc
View file

@ -28,9 +28,6 @@ Created 4/24/1996 Heikki Tuuri
#include "ha_prototypes.h" #include "ha_prototypes.h"
#include "dict0load.h" #include "dict0load.h"
#ifdef UNIV_NONINL
#include "dict0load.ic"
#endif
#include "mysql_version.h" #include "mysql_version.h"
#include "btr0pcur.h" #include "btr0pcur.h"

5
storage/innobase/dict/dict0mem.cc
View file

@ -29,11 +29,6 @@ Created 1/8/1996 Heikki Tuuri
#include <mysql_com.h> #include <mysql_com.h>
#include "dict0mem.h" #include "dict0mem.h"
#ifdef UNIV_NONINL
#include "dict0mem.ic"
#endif
#include "rem0rec.h" #include "rem0rec.h"
#include "data0type.h" #include "data0type.h"
#include "mach0data.h" #include "mach0data.h"

4
storage/innobase/dict/dict0stats_bg.cc
View file

@ -32,10 +32,6 @@ Created Apr 25, 2012 Vasil Dimov
#include "srv0start.h" #include "srv0start.h"
#include "ut0new.h" #include "ut0new.h"
#ifdef UNIV_NONINL
# include "dict0stats_bg.ic"
#endif
#include <vector> #include <vector>
/** Minimum time interval between stats recalc for a given table */ /** Minimum time interval between stats recalc for a given table */

7
storage/innobase/eval/eval0eval.cc
View file

@ -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 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 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" #include "eval0eval.h"
#ifdef UNIV_NONINL
#include "eval0eval.ic"
#endif
#include "data0data.h" #include "data0data.h"
#include "row0sel.h" #include "row0sel.h"
#include "rem0cmp.h" #include "rem0cmp.h"

6
storage/innobase/eval/eval0proc.cc
View file

@ -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 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 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" #include "eval0proc.h"
#ifdef UNIV_NONINL
#include "eval0proc.ic"
#endif
/**********************************************************************//** /**********************************************************************//**
Performs an execution step of an if-statement node. Performs an execution step of an if-statement node.
@return query thread to run next or NULL */ @return query thread to run next or NULL */

5
storage/innobase/fsp/fsp0fsp.cc
View file

@ -27,11 +27,6 @@ Created 11/29/1995 Heikki Tuuri
#include "ha_prototypes.h" #include "ha_prototypes.h"
#include "fsp0fsp.h" #include "fsp0fsp.h"
#ifdef UNIV_NONINL
#include "fsp0fsp.ic"
#endif
#include "buf0buf.h" #include "buf0buf.h"
#include "fil0fil.h" #include "fil0fil.h"
#include "fil0crypt.h" #include "fil0crypt.h"

7
storage/innobase/fts/fts0config.cc
View file

@ -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 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 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" #include "fts0priv.h"
#ifdef UNIV_NONINL
#include "fts0types.ic"
#include "fts0vlc.ic"
#endif
/******************************************************************//** /******************************************************************//**
Callback function for fetching the config value. Callback function for fetching the config value.
@return always returns TRUE */ @return always returns TRUE */

5
storage/innobase/fts/fts0opt.cc
View file

@ -38,11 +38,6 @@ Completed 2011/7/10 Sunny and Jimmy Yang
#include "ut0list.h" #include "ut0list.h"
#include "zlib.h" #include "zlib.h"
#ifdef UNIV_NONINL
#include "fts0types.ic"
#include "fts0vlc.ic"
#endif
/** The FTS optimize thread's work queue. */ /** The FTS optimize thread's work queue. */
static ib_wqueue_t* fts_optimize_wq; static ib_wqueue_t* fts_optimize_wq;

5
storage/innobase/fts/fts0que.cc
View file

@ -37,11 +37,6 @@ Completed 2011/7/10 Sunny and Jimmy Yang
#include "fts0plugin.h" #include "fts0plugin.h"
#include "ut0new.h" #include "ut0new.h"
#ifdef UNIV_NONINL
#include "fts0types.ic"
#include "fts0vlc.ic"
#endif
#include <iomanip> #include <iomanip>
#include <vector> #include <vector>

7
storage/innobase/fts/fts0sql.cc
View file

@ -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 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 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 "fts0types.h"
#include "fts0priv.h" #include "fts0priv.h"
#ifdef UNIV_NONINL
#include "fts0types.ic"
#include "fts0vlc.ic"
#endif
/** SQL statements for creating the ancillary FTS tables. */ /** SQL statements for creating the ancillary FTS tables. */
/** Preamble to all SQL statements. */ /** Preamble to all SQL statements. */

31
storage/innobase/fut/fut0fut.cc
View file

@ -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

8
storage/innobase/fut/fut0lst.cc
View file

@ -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 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 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 Created 11/28/1995 Heikki Tuuri
***********************************************************************/ ***********************************************************************/
#include "univ.i"
#include "fut0lst.h" #include "fut0lst.h"
#ifdef UNIV_NONINL
#include "fut0lst.ic"
#endif
#include "buf0buf.h" #include "buf0buf.h"
#include "page0page.h" #include "page0page.h"

5
storage/innobase/ha/ha0ha.cc
View file

@ -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 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 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" #include "ha0ha.h"
#ifdef UNIV_NONINL
#include "ha0ha.ic"
#endif
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
# include "buf0buf.h" # include "buf0buf.h"

6
storage/innobase/ha/ha0storage.cc
View file

@ -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 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 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 "mem0mem.h"
#include "ut0rnd.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 Retrieves a data from a storage. If it is present, a pointer to the
stored copy of data is returned, otherwise NULL is returned. */ stored copy of data is returned, otherwise NULL is returned. */

7
storage/innobase/ha/hash0hash.cc
View file

@ -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 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 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" #include "hash0hash.h"
#ifdef UNIV_NONINL
#include "hash0hash.ic"
#endif /* UNIV_NOINL */
#include "mem0mem.h" #include "mem0mem.h"
#include "sync0sync.h" #include "sync0sync.h"

4
storage/innobase/ibuf/ibuf0ibuf.cc
View file

@ -42,10 +42,6 @@ my_bool srv_ibuf_disable_background_merge;
/** The start address for an insert buffer bitmap page bitmap */ /** The start address for an insert buffer bitmap page bitmap */
#define IBUF_BITMAP PAGE_DATA #define IBUF_BITMAP PAGE_DATA
#ifdef UNIV_NONINL
#include "ibuf0ibuf.ic"
#endif
#include "buf0buf.h" #include "buf0buf.h"
#include "buf0rea.h" #include "buf0rea.h"
#include "fsp0fsp.h" #include "fsp0fsp.h"

2
storage/innobase/include/btr0btr.h
View file

@ -823,9 +823,7 @@ btr_lift_page_up(
#define BTR_N_LEAF_PAGES 1 #define BTR_N_LEAF_PAGES 1
#define BTR_TOTAL_SIZE 2 #define BTR_TOTAL_SIZE 2
#ifndef UNIV_NONINL
#include "btr0btr.ic" #include "btr0btr.ic"
#endif
/**************************************************************** /****************************************************************
Global variable controlling if scrubbing should be performed */ Global variable controlling if scrubbing should be performed */

2
storage/innobase/include/btr0cur.h
View file

@ -997,8 +997,6 @@ extern ulint btr_cur_n_sea_old;
extern uint btr_cur_limit_optimistic_insert_debug; extern uint btr_cur_limit_optimistic_insert_debug;
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#ifndef UNIV_NONINL
#include "btr0cur.ic" #include "btr0cur.ic"
#endif
#endif #endif

2
storage/innobase/include/btr0pcur.h
View file

@ -548,8 +548,6 @@ struct btr_pcur_t{
dict_index_t* index() const { return(btr_cur.index); } dict_index_t* index() const { return(btr_cur.index); }
}; };
#ifndef UNIV_NONINL
#include "btr0pcur.ic" #include "btr0pcur.ic"
#endif
#endif #endif

2
storage/innobase/include/btr0sea.h
View file

@ -373,8 +373,6 @@ again set this much timeout. This is to reduce contention. */
#define BTR_SEA_TIMEOUT 10000 #define BTR_SEA_TIMEOUT 10000
#endif /* BTR_CUR_HASH_ADAPT */ #endif /* BTR_CUR_HASH_ADAPT */
#ifndef UNIV_NONINL
#include "btr0sea.ic" #include "btr0sea.ic"
#endif
#endif #endif

4
storage/innobase/include/buf0buddy.h
View file

@ -88,8 +88,6 @@ void
buf_buddy_condense_free( buf_buddy_condense_free(
buf_pool_t* buf_pool); buf_pool_t* buf_pool);
#ifndef UNIV_NONINL #include "buf0buddy.ic"
# include "buf0buddy.ic"
#endif
#endif /* buf0buddy_h */ #endif /* buf0buddy_h */

3
storage/innobase/include/buf0buf.h
View file

@ -2508,9 +2508,8 @@ struct CheckUnzipLRUAndLRUList {
}; };
#endif /* UNIV_DEBUG || defined UNIV_BUF_DEBUG */ #endif /* UNIV_DEBUG || defined UNIV_BUF_DEBUG */
#ifndef UNIV_NONINL
#include "buf0buf.ic" #include "buf0buf.ic"
#endif
#endif /* !UNIV_INNOCHECKSUM */ #endif /* !UNIV_INNOCHECKSUM */
#endif #endif

2
storage/innobase/include/buf0flu.h
View file

@ -485,8 +485,6 @@ buf_flush_batch(
counts */ counts */
#ifndef UNIV_NONINL
#include "buf0flu.ic" #include "buf0flu.ic"
#endif
#endif #endif

5
storage/innobase/include/buf0lru.h
View file

@ -1,6 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1995, 2016, 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 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 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. */ Increments the page_zip_decompress() counter in buf_LRU_stat_cur. */
#define buf_LRU_stat_inc_unzip() buf_LRU_stat_cur.unzip++ #define buf_LRU_stat_inc_unzip() buf_LRU_stat_cur.unzip++
#ifndef UNIV_NONINL
#include "buf0lru.ic"
#endif
#endif #endif

25
storage/innobase/include/buf0lru.ic
View file

@ -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
*******************************************************/

2
storage/innobase/include/data0data.h
View file

@ -684,8 +684,6 @@ struct big_rec_t {
ulint n_fld); ulint n_fld);
}; };
#ifndef UNIV_NONINL
#include "data0data.ic" #include "data0data.ic"
#endif
#endif #endif

4
storage/innobase/include/data0type.h
View file

@ -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. Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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) */ mbmaxlen=DATA_MBMINLEN(mbminmaxlen) */
}; };
#ifndef UNIV_NONINL
#include "data0type.ic" #include "data0type.ic"
#endif
#endif #endif

2
storage/innobase/include/dict0boot.h
View file

@ -353,8 +353,6 @@ two) is assigned, the field DICT_HDR_ROW_ID on the dictionary header page is
updated */ updated */
#define DICT_HDR_ROW_ID_WRITE_MARGIN 256 #define DICT_HDR_ROW_ID_WRITE_MARGIN 256
#ifndef UNIV_NONINL
#include "dict0boot.ic" #include "dict0boot.ic"
#endif
#endif #endif

2
storage/innobase/include/dict0crea.h
View file

@ -383,8 +383,6 @@ dict_get_v_col_pos(
#define INDEX_CREATE_INDEX_TREE 3 #define INDEX_CREATE_INDEX_TREE 3
#define INDEX_ADD_TO_CACHE 4 #define INDEX_ADD_TO_CACHE 4
#ifndef UNIV_NONINL
#include "dict0crea.ic" #include "dict0crea.ic"
#endif
#endif #endif

2
storage/innobase/include/dict0dict.h
View file

@ -2063,8 +2063,6 @@ bool
dict_table_have_virtual_index( dict_table_have_virtual_index(
dict_table_t* table); dict_table_t* table);
#ifndef UNIV_NONINL
#include "dict0dict.ic" #include "dict0dict.ic"
#endif
#endif #endif

4
storage/innobase/include/dict0load.h
View file

@ -430,8 +430,4 @@ dict_replace_tablespace_and_filepath(
const char* filepath, const char* filepath,
ulint fsp_flags); ulint fsp_flags);
#ifndef UNIV_NONINL
#include "dict0load.ic"
#endif
#endif #endif

26
storage/innobase/include/dict0load.ic
View file

@ -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
*******************************************************/

2
storage/innobase/include/dict0mem.h
View file

@ -1870,8 +1870,6 @@ dict_col_get_spatial_status(
return(spatial_status); return(spatial_status);
} }
#ifndef UNIV_NONINL
#include "dict0mem.ic" #include "dict0mem.ic"
#endif
#endif /* dict0mem_h */ #endif /* dict0mem_h */

2
storage/innobase/include/dict0pagecompress.h
View file

@ -56,8 +56,6 @@ dict_table_page_compression_level(
const dict_table_t* table) /*!< in: table */ const dict_table_t* table) /*!< in: table */
__attribute__((const)); __attribute__((const));
#ifndef UNIV_NONINL
#include "dict0pagecompress.ic" #include "dict0pagecompress.ic"
#endif
#endif #endif

4
storage/innobase/include/dict0priv.h
View file

@ -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 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 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 */ when loading the table */
ibool open_only_if_in_cache); ibool open_only_if_in_cache);
#ifndef UNIV_NONINL
#include "dict0priv.ic" #include "dict0priv.ic"
#endif
#endif /* dict0priv.h */ #endif /* dict0priv.h */

2
storage/innobase/include/dict0stats.h
View file

@ -263,9 +263,7 @@ dict_stats_save_index_stat(
const char* stat_description, const char* stat_description,
trx_t* trx); trx_t* trx);
#ifndef UNIV_NONINL
#include "dict0stats.ic" #include "dict0stats.ic"
#endif
#ifdef UNIV_ENABLE_UNIT_TEST_DICT_STATS #ifdef UNIV_ENABLE_UNIT_TEST_DICT_STATS
void test_dict_stats_all(); void test_dict_stats_all();

18
storage/innobase/include/dict0stats_bg.h
View file

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 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 the terms of the GNU General Public License as published by the Free Software
@ -83,7 +83,17 @@ bool
dict_stats_stop_bg( dict_stats_stop_bg(
/*===============*/ /*===============*/
dict_table_t* table) /*!< in/out: table */ 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. Wait until background stats thread has stopped using the specified table.
@ -145,8 +155,4 @@ DECLARE_THREAD(dict_stats_thread)(
void void
dict_stats_shutdown(); dict_stats_shutdown();
# ifndef UNIV_NONINL
# include "dict0stats_bg.ic"
# endif
#endif /* dict0stats_bg_h */ #endif /* dict0stats_bg_h */

45
storage/innobase/include/dict0stats_bg.ic
View file

@ -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);
}

4
storage/innobase/include/eval0eval.h
View file

@ -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 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 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 */ func_node_t* cmp_node); /*!< in: comparison node */
#ifndef UNIV_NONINL
#include "eval0eval.ic" #include "eval0eval.ic"
#endif
#endif #endif

5
storage/innobase/include/eval0proc.h
View file

@ -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 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 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 */ que_thr_t* thr); /*!< in: query thread */
#ifndef UNIV_NONINL
#include "eval0proc.ic" #include "eval0proc.ic"
#endif
#endif #endif

2
storage/innobase/include/fil0crypt.h
View file

@ -533,8 +533,6 @@ fil_crypt_calculate_checksum(
byte* dst_frame) /*!< in: page where to calculate */ byte* dst_frame) /*!< in: page where to calculate */
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
#ifndef UNIV_NONINL
#include "fil0crypt.ic" #include "fil0crypt.ic"
#endif
#endif /* fil0crypt_h */ #endif /* fil0crypt_h */

7
storage/innobase/include/fil0fil.h
View file

@ -1591,12 +1591,7 @@ fil_decr_pending_ops(
/*=================*/ /*=================*/
ulint id); /*!< in: space id */ ulint id); /*!< in: space id */
#include "fil0fil.ic"
#endif /* UNIV_INNOCHECKSUM */ #endif /* UNIV_INNOCHECKSUM */
#ifndef UNIV_INNOCHECKSUM
#ifndef UNIV_NONINL
#include "fil0fil.ic"
#endif
#endif
#endif /* fil0fil_h */ #endif /* fil0fil_h */

2
storage/innobase/include/fsp0fsp.h
View file

@ -869,8 +869,6 @@ fsp_page_is_free_func(
#endif /* UNIV_INNOCHECKSUM */ #endif /* UNIV_INNOCHECKSUM */
#ifndef UNIV_NONINL
#include "fsp0fsp.ic" #include "fsp0fsp.ic"
#endif
#endif #endif

2
storage/innobase/include/fsp0pagecompress.h
View file

@ -59,8 +59,6 @@ fsp_flags_get_page_compression_level(
/*=================================*/ /*=================================*/
ulint flags); /*!< in: tablespace flags */ ulint flags); /*!< in: tablespace flags */
#ifndef UNIV_NONINL
#include "fsp0pagecompress.ic" #include "fsp0pagecompress.ic"
#endif
#endif #endif

2
storage/innobase/include/fts0priv.h
View file

@ -639,8 +639,6 @@ fts_config_create_index_param_name(
const dict_index_t* index) /*!< in: index for config */ const dict_index_t* index) /*!< in: index for config */
MY_ATTRIBUTE((warn_unused_result)); MY_ATTRIBUTE((warn_unused_result));
#ifndef UNIV_NONINL
#include "fts0priv.ic" #include "fts0priv.ic"
#endif
#endif /* INNOBASE_FTS0PRIV_H */ #endif /* INNOBASE_FTS0PRIV_H */

2
storage/innobase/include/fts0types.h
View file

@ -399,9 +399,7 @@ fts_select_index(
const byte* str, const byte* str,
ulint len); ulint len);
#ifndef UNIV_NONINL
#include "fts0types.ic" #include "fts0types.ic"
#include "fts0vlc.ic" #include "fts0vlc.ic"
#endif
#endif /* INNOBASE_FTS0TYPES_H */ #endif /* INNOBASE_FTS0TYPES_H */

2
storage/innobase/include/fut0fut.h
View file

@ -52,8 +52,6 @@ fut_get_ptr(
buf_block_t** ptr_block = NULL) buf_block_t** ptr_block = NULL)
MY_ATTRIBUTE((warn_unused_result)); MY_ATTRIBUTE((warn_unused_result));
#ifndef UNIV_NONINL
#include "fut0fut.ic" #include "fut0fut.ic"
#endif
#endif /* fut0fut_h */ #endif /* fut0fut_h */

2
storage/innobase/include/fut0lst.h
View file

@ -177,9 +177,7 @@ flst_print(
mtr_t* mtr); /*!< in: mtr */ mtr_t* mtr); /*!< in: mtr */
#ifndef UNIV_NONINL
#include "fut0lst.ic" #include "fut0lst.ic"
#endif
#endif /* !UNIV_INNOCHECKSUM */ #endif /* !UNIV_INNOCHECKSUM */

2
storage/innobase/include/gis0rtree.h
View file

@ -584,7 +584,5 @@ rtr_estimate_n_rows_in_range(
const dtuple_t* tuple, const dtuple_t* tuple,
page_cur_mode_t mode); page_cur_mode_t mode);
#ifndef UNIV_NONINL
#include "gis0rtree.ic" #include "gis0rtree.ic"
#endif
#endif /*!< gis0rtree.h */ #endif /*!< gis0rtree.h */

5
storage/innobase/include/ha0ha.h
View file

@ -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 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 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) #define hash_assert_can_search(t, f)
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#ifndef UNIV_NONINL
#include "ha0ha.ic" #include "ha0ha.ic"
#endif
#endif #endif

4
storage/innobase/include/ha0storage.h
View file

@ -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 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 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 */ const ha_storage_t* storage); /*!< in: hash storage */
#ifndef UNIV_NONINL
#include "ha0storage.ic" #include "ha0storage.ic"
#endif
#endif /* ha0storage_h */ #endif /* ha0storage_h */

4
storage/innobase/include/hash0hash.h
View file

@ -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 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 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 */ #endif /* UNIV_DEBUG */
}; };
#ifndef UNIV_NONINL
#include "hash0hash.ic" #include "hash0hash.ic"
#endif
#endif #endif

2
storage/innobase/include/ibuf0ibuf.h
View file

@ -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. */ /* The insert buffer tree itself is always located in space 0. */
#define IBUF_SPACE_ID static_cast<ulint>(0) #define IBUF_SPACE_ID static_cast<ulint>(0)
#ifndef UNIV_NONINL
#include "ibuf0ibuf.ic" #include "ibuf0ibuf.ic"
#endif
#endif #endif

2
storage/innobase/include/lock0lock.h
View file

@ -1172,8 +1172,6 @@ lock_update_split_and_merge(
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
#ifndef UNIV_NONINL
#include "lock0lock.ic" #include "lock0lock.ic"
#endif
#endif #endif

2
storage/innobase/include/lock0priv.h
View file

@ -1170,8 +1170,6 @@ lock_table_has(
const dict_table_t* table, /*!< in: table */ const dict_table_t* table, /*!< in: table */
enum lock_mode mode); /*!< in: lock mode */ enum lock_mode mode); /*!< in: lock mode */
#ifndef UNIV_NONINL
#include "lock0priv.ic" #include "lock0priv.ic"
#endif
#endif /* lock0priv_h */ #endif /* lock0priv_h */

2
storage/innobase/include/log0log.h
View file

@ -814,8 +814,6 @@ extern os_event_t log_scrub_event;
/** Whether log_scrub_thread is active */ /** Whether log_scrub_thread is active */
extern bool log_scrub_thread_active; extern bool log_scrub_thread_active;
#ifndef UNIV_NONINL
#include "log0log.ic" #include "log0log.ic"
#endif
#endif #endif

2
storage/innobase/include/mach0data.h
View file

@ -375,8 +375,6 @@ mach_read_ulint(
#endif /* !UNIV_INNOCHECKSUM */ #endif /* !UNIV_INNOCHECKSUM */
#ifndef UNIV_NONINL
#include "mach0data.ic" #include "mach0data.ic"
#endif
#endif #endif

2
storage/innobase/include/mem0mem.h
View file

@ -411,9 +411,7 @@ struct mem_block_info_t {
#define MEM_BLOCK_HEADER_SIZE ut_calc_align(sizeof(mem_block_info_t),\ #define MEM_BLOCK_HEADER_SIZE ut_calc_align(sizeof(mem_block_info_t),\
UNIV_MEM_ALIGNMENT) UNIV_MEM_ALIGNMENT)
#ifndef UNIV_NONINL
#include "mem0mem.ic" #include "mem0mem.ic"
#endif
/** A C++ wrapper class to the mem_heap_t routines, so that it can be used /** A C++ wrapper class to the mem_heap_t routines, so that it can be used
as an STL allocator */ as an STL allocator */

2
storage/innobase/include/mtr0log.h
View file

@ -243,8 +243,6 @@ mlog_parse_index(
extra mlog buffer size for variable size data */ extra mlog buffer size for variable size data */
#define MLOG_BUF_MARGIN 256 #define MLOG_BUF_MARGIN 256
#ifndef UNIV_NONINL
#include "mtr0log.ic" #include "mtr0log.ic"
#endif /* UNIV_NOINL */
#endif /* mtr0log_h */ #endif /* mtr0log_h */

2
storage/innobase/include/mtr0mtr.h
View file

@ -612,8 +612,6 @@ private:
bool m_sync; bool m_sync;
}; };
#ifndef UNIV_NONINL
#include "mtr0mtr.ic" #include "mtr0mtr.ic"
#endif /* UNIV_NOINL */
#endif /* mtr0mtr_h */ #endif /* mtr0mtr_h */

2
storage/innobase/include/os0file.h
View file

@ -1606,8 +1606,6 @@ os_file_get_block_size(
os_file_t file, /*!< in: handle to a file */ os_file_t file, /*!< in: handle to a file */
const char* name); /*!< in: file name */ const char* name); /*!< in: file name */
#ifndef UNIV_NONINL
#include "os0file.ic" #include "os0file.ic"
#endif /* UNIV_NONINL */
#endif /* os0file_h */ #endif /* os0file_h */

7
storage/innobase/include/os0proc.h
View file

@ -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 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 the terms of the GNU General Public License as published by the Free Software
@ -67,8 +68,4 @@ os_mem_free_large(
void *ptr, void *ptr,
ulint size); ulint size);
#ifndef UNIV_NONINL
#include "os0proc.ic"
#endif
#endif #endif

27
storage/innobase/include/os0proc.ic
View file

@ -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
*******************************************************/

5
storage/innobase/include/os0thread.h
View file

@ -1,6 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1995, 2016, 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 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 the terms of the GNU General Public License as published by the Free Software
@ -159,8 +160,4 @@ bool
os_thread_active(); os_thread_active();
/*==============*/ /*==============*/
#ifndef UNIV_NONINL
#include "os0thread.ic"
#endif
#endif #endif

25
storage/innobase/include/os0thread.ic
View file

@ -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
*******************************************************/

2
storage/innobase/include/page0cur.h
View file

@ -387,8 +387,6 @@ struct page_cur_t{
buf_block_t* block; /*!< pointer to the block containing rec */ buf_block_t* block; /*!< pointer to the block containing rec */
}; };
#ifndef UNIV_NONINL
#include "page0cur.ic" #include "page0cur.ic"
#endif
#endif #endif

2
storage/innobase/include/page0page.h
View file

@ -1193,9 +1193,7 @@ page_warn_strict_checksum(
#endif /* !UNIV_INNOCHECKSUM */ #endif /* !UNIV_INNOCHECKSUM */
#ifndef UNIV_NONINL
#include "page0page.ic" #include "page0page.ic"
#endif
#endif #endif

4
storage/innobase/include/page0zip.h
View file

@ -564,9 +564,7 @@ page_zip_reset_stat_per_index();
# define UNIV_INLINE UNIV_INLINE_ORIGINAL # define UNIV_INLINE UNIV_INLINE_ORIGINAL
#endif #endif
#ifndef UNIV_NONINL #include "page0zip.ic"
# include "page0zip.ic"
#endif
#endif /* !UNIV_INNOCHECKSUM */ #endif /* !UNIV_INNOCHECKSUM */
#endif /* page0zip_h */ #endif /* page0zip_h */

7
storage/innobase/include/pars0opt.h
View file

@ -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 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 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 */ sel_node_t* sel_node); /*!< in: select node */
#endif /* UNIV_SQL_DEBUG */ #endif /* UNIV_SQL_DEBUG */
#ifndef UNIV_NONINL
#include "pars0opt.ic"
#endif
#endif #endif

24
storage/innobase/include/pars0opt.ic
View file

@ -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
*******************************************************/

5
storage/innobase/include/pars0pars.h
View file

@ -1,6 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2016, 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 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 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., := */ e.g., := */
/* @} */ /* @} */
#ifndef UNIV_NONINL
#include "pars0pars.ic"
#endif
#endif #endif

24
storage/innobase/include/pars0pars.ic
View file

@ -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
*******************************************************/

7
storage/innobase/include/pars0sym.h
View file

@ -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 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 the terms of the GNU General Public License as published by the Free Software
@ -242,8 +243,4 @@ struct sym_tab_t{
allocate space */ allocate space */
}; };
#ifndef UNIV_NONINL
#include "pars0sym.ic"
#endif
#endif #endif

24
storage/innobase/include/pars0sym.ic
View file

@ -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
*******************************************************/

4
storage/innobase/include/que0que.h
View file

@ -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. Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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_CALL 31
#define QUE_NODE_EXIT 32 #define QUE_NODE_EXIT 32
#ifndef UNIV_NONINL
#include "que0que.ic" #include "que0que.ic"
#endif
#endif #endif

2
storage/innobase/include/rem0cmp.h
View file

@ -250,8 +250,6 @@ cmp_dfield_dfield_like_prefix(
const dfield_t* dfield1, const dfield_t* dfield1,
const dfield_t* dfield2); const dfield_t* dfield2);
#ifndef UNIV_NONINL
#include "rem0cmp.ic" #include "rem0cmp.ic"
#endif
#endif #endif

2
storage/innobase/include/rem0rec.h
View file

@ -1120,8 +1120,6 @@ int wsrep_rec_get_foreign_key(
ibool new_protocol); /* in: protocol > 1 */ ibool new_protocol); /* in: protocol > 1 */
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
#ifndef UNIV_NONINL
#include "rem0rec.ic" #include "rem0rec.ic"
#endif
#endif /* rem0rec_h */ #endif /* rem0rec_h */

4
storage/innobase/include/row0ext.h
View file

@ -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 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 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 */ ulint len[1]; /*!< prefix lengths; 0 if not cached */
}; };
#ifndef UNIV_NONINL
#include "row0ext.ic" #include "row0ext.ic"
#endif
#endif #endif

4
storage/innobase/include/row0import.h
View file

@ -1,6 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 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 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 caller already owns the
dict_sys_t:: mutex. */ dict_sys_t:: mutex. */
MY_ATTRIBUTE((nonnull, warn_unused_result)); MY_ATTRIBUTE((nonnull, warn_unused_result));
#ifndef UNIV_NONINL
#include "row0import.ic"
#endif
#endif /* row0import_h */ #endif /* row0import_h */

25
storage/innobase/include/row0import.ic
View file

@ -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
*******************************************************/

4
storage/innobase/include/row0ins.h
View file

@ -253,8 +253,4 @@ struct ins_node_t{
#define INS_NODE_INSERT_ENTRIES 3 /* index entries should be built and #define INS_NODE_INSERT_ENTRIES 3 /* index entries should be built and
inserted */ inserted */
#ifndef UNIV_NONINL
#include "row0ins.ic"
#endif
#endif #endif

26
storage/innobase/include/row0ins.ic
View file

@ -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
*******************************************************/

Some files were not shown because too many files have changed in this diff Show more