diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 12:00:23 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 12:00:23 +0200 |
commit | 909775a7623505bea1b42327c7ce592b649dcdab (patch) | |
tree | 13dc2799539d83d0d02b0f4e2d9593489eb0bf27 /sql/mysqld.h | |
parent | 39f82b4e6ebed949ba17fe4884d96471574c1da1 (diff) | |
parent | 6d06ccbe5384874877485ddc470a89217d90c88d (diff) | |
download | mariadb-git-909775a7623505bea1b42327c7ce592b649dcdab.tar.gz |
mariadb-5.5.33 merge
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r-- | sql/mysqld.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index c9912b36f18..8449ffdafac 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -322,7 +322,6 @@ extern uint mysql_data_home_len; extern uint mysql_real_data_home_len; extern const char *mysql_real_data_home_ptr; extern ulong thread_handling; -extern MYSQL_PLUGIN_IMPORT char *mysql_data_home; extern "C" MYSQL_PLUGIN_IMPORT char server_version[SERVER_VERSION_LENGTH]; extern MYSQL_PLUGIN_IMPORT char mysql_real_data_home[]; extern char mysql_unpacked_real_data_home[]; |