diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2015-05-26 10:01:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-17 12:48:50 +0200 |
| commit | 97acc4a1c37974cb2a1e3d6d163e107cb038a7a6 (patch) | |
| tree | e8f0732924a8a1127334cc9c9e9813088413eb45 /storage/innobase/data | |
| parent | 4e1116b2c6e1b6e0714fb2ed742842f1ee6bfab5 (diff) | |
| download | mariadb-git-97acc4a1c37974cb2a1e3d6d163e107cb038a7a6.tar.gz | |
MDEV-12270 Port MySQL 8.0 Bug#21141390 REMOVE UNUSED FUNCTIONS AND CONVERT GLOBAL SYMBOLS TO STATIC
InnoDB defines some functions that are not called at all.
Other functions are called, but only from the same compilation unit.
Remove some function declarations and definitions, and add 'static'
keywords. Some symbols must be kept for separately compiled tools,
such as innochecksum.
Diffstat (limited to 'storage/innobase/data')
| -rw-r--r-- | storage/innobase/data/data0data.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/data/data0type.cc | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/storage/innobase/data/data0data.cc b/storage/innobase/data/data0data.cc index a5e51c9117e..4377667f9cb 100644 --- a/storage/innobase/data/data0data.cc +++ b/storage/innobase/data/data0data.cc @@ -121,6 +121,7 @@ dfield_check_typed_no_assert( /**********************************************************//** Checks that a data tuple is typed. @return TRUE if ok */ +static ibool dtuple_check_typed_no_assert( /*=========================*/ diff --git a/storage/innobase/data/data0type.cc b/storage/innobase/data/data0type.cc index 3b3c4c212ac..315b12e135c 100644 --- a/storage/innobase/data/data0type.cc +++ b/storage/innobase/data/data0type.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2015, 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 @@ -157,12 +157,11 @@ dtype_validate( return(TRUE); } -/*********************************************************************//** -Prints a data type structure. */ +#ifdef UNIV_DEBUG +/** Print a data type structure. +@param[in] type data type */ void -dtype_print( -/*========*/ - const dtype_t* type) /*!< in: type */ +dtype_print(const dtype_t* type) { ulint mtype; ulint prtype; @@ -274,3 +273,4 @@ dtype_print( fprintf(stderr, " len %lu", (ulong) len); } +#endif /* UNIV_DEBUG */ |