summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2013-02-08 09:23:12 +0200
committerMarko Mäkelä <marko.makela@oracle.com>2013-02-08 09:23:12 +0200
commit5620418c51f89c50796c03ed1d471abcecb704c0 (patch)
tree59633bcbe37cfbe240c6436bf12e942ae81ff715
parent97c7996e89978da3403848c971f686b6cd3b89f4 (diff)
downloadmariadb-git-5620418c51f89c50796c03ed1d471abcecb704c0.tar.gz
Add missing linkage specifiers, so that ha_innodb_plugin.so
will not export internal symbols.
-rw-r--r--storage/innodb_plugin/handler/ha_innodb.cc1
-rw-r--r--storage/innodb_plugin/trx/trx0sys.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
index 229e7fe71e5..e0339b727ea 100644
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
@@ -1067,6 +1067,7 @@ mysqld.cc. We do a dirty read because for one there is no synchronization
object and secondly there is little harm in doing so even if we get a torn
read.
@return value of lower_case_table_names */
+static
ulint
innobase_get_lower_case_table_names(void)
/*=====================================*/
diff --git a/storage/innodb_plugin/trx/trx0sys.c b/storage/innodb_plugin/trx/trx0sys.c
index daa65bfcef0..6b44db14af7 100644
--- a/storage/innodb_plugin/trx/trx0sys.c
+++ b/storage/innodb_plugin/trx/trx0sys.c
@@ -129,7 +129,7 @@ static const ulint FILE_FORMAT_NAME_N
#ifdef UNIV_DEBUG
/* Flag to control TRX_RSEG_N_SLOTS behavior debugging. */
-uint trx_rseg_n_slots_debug = 0;
+UNIV_INTERN uint trx_rseg_n_slots_debug = 0;
#endif
#ifndef UNIV_HOTBACKUP