summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2015-01-22 08:58:13 +0100
committerSergei Golubchik <sergii@pisem.net>2015-01-22 08:58:13 +0100
commitf2be9c0fea8e2d736a44bb46db5b87666e3eac9e (patch)
tree6e75516e4932ae524be5b24b12f7ec1d0693819c
parent6e8e081a6f1e1bd15c92def7af342b03b1a8c0dd (diff)
downloadmariadb-git-f2be9c0fea8e2d736a44bb46db5b87666e3eac9e.tar.gz
after merge. innodb/xtradb to work on Windows
-rw-r--r--storage/innobase/fil/fil0fil.cc2
-rw-r--r--storage/innobase/include/fil0fil.h1
-rw-r--r--storage/xtradb/fil/fil0fil.cc2
-rw-r--r--storage/xtradb/include/fil0fil.h1
4 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index a77893b7ab7..4175abdf895 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -55,6 +55,8 @@ Created 10/25/1995 Heikki Tuuri
static ulint srv_data_read, srv_data_written;
#endif /* !UNIV_HOTBACKUP */
+MYSQL_PLUGIN_IMPORT extern my_bool lower_case_file_system;
+
/*
IMPLEMENTATION OF THE TABLESPACE MEMORY CACHE
=============================================
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index 5d9f96ce364..da2ee1c5730 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -42,7 +42,6 @@ Created 10/25/1995 Heikki Tuuri
#include <list>
-extern my_bool lower_case_file_system;
// Forward declaration
struct trx_t;
struct fil_space_t;
diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc
index 115d8da16be..5d547edaaf9 100644
--- a/storage/xtradb/fil/fil0fil.cc
+++ b/storage/xtradb/fil/fil0fil.cc
@@ -55,6 +55,8 @@ Created 10/25/1995 Heikki Tuuri
static ulint srv_data_read, srv_data_written;
#endif /* !UNIV_HOTBACKUP */
+MYSQL_PLUGIN_IMPORT extern my_bool lower_case_file_system;
+
/*
IMPLEMENTATION OF THE TABLESPACE MEMORY CACHE
=============================================
diff --git a/storage/xtradb/include/fil0fil.h b/storage/xtradb/include/fil0fil.h
index b6bc326ecdc..7edf79043d3 100644
--- a/storage/xtradb/include/fil0fil.h
+++ b/storage/xtradb/include/fil0fil.h
@@ -43,7 +43,6 @@ Created 10/25/1995 Heikki Tuuri
#include <list>
-extern my_bool lower_case_file_system;
// Forward declaration
struct trx_t;
struct fil_space_t;