From 178a51121755f17e308e8af5907a2e3d5b92b259 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Thu, 16 Oct 2014 19:50:53 -0400 Subject: [PATCH 1/4] DB-742 set the tokudb plugin version string for mariadb --- storage/tokudb/hatoku_hton.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index f2acda527e5..399c369d339 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -2273,7 +2273,6 @@ static int tokudb_locks_done(void *p) { } enum { TOKUDB_PLUGIN_VERSION = 0x0400 }; -#define TOKUDB_PLUGIN_VERSION_STR "1024" // Retrieves variables for information_schema.global_status. // Names (columnname) are automatically converted to upper case, and prefixed with "TOKUDB_" @@ -2497,6 +2496,12 @@ mysql_declare_plugin_end; #ifdef MARIA_PLUGIN_INTERFACE_VERSION +#ifdef TOKUDB_VERSION +#define TOKUDB_PLUGIN_VERSION_STR TOKUDB_VERSION +#else +#define TOKUDB_PLUGIN_VERSION_STR NULL +#endif + maria_declare_plugin(tokudb) { MYSQL_STORAGE_ENGINE_PLUGIN, From 5788312433906ea34de02818c9aac3f591090469 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Fri, 17 Oct 2014 13:46:15 -0400 Subject: [PATCH 2/4] DB-742 set plugin version to tokudb_version_major.tokudb_version_minor --- storage/tokudb/CMakeLists.txt | 5 +++++ storage/tokudb/hatoku_hton.cc | 36 +++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index c7c3f164eed..2c13d64fe7a 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -25,6 +25,11 @@ IF(NOT DEFINED TOKUDB_VERSION) ENDIF() IF(DEFINED TOKUDB_VERSION) ADD_DEFINITIONS("-DTOKUDB_VERSION=\"${TOKUDB_VERSION}\"") + IF (${TOKUDB_VERSION} MATCHES "^tokudb-([0-9]+)\\.([0-9]+)\\.([0-9]+.*)") + ADD_DEFINITIONS("-DTOKUDB_VERSION_MAJOR=${CMAKE_MATCH_1}") + ADD_DEFINITIONS("-DTOKUDB_VERSION_MINOR=${CMAKE_MATCH_2}") + ADD_DEFINITIONS("-DTOKUDB_VERSION_PATCH=\"${CMAKE_MATCH_3}\"") + ENDIF() ENDIF() IF(DEFINED TOKUDB_NOPATCH_CONFIG) diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index 399c369d339..048a5ca5172 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -2272,8 +2272,6 @@ static int tokudb_locks_done(void *p) { return 0; } -enum { TOKUDB_PLUGIN_VERSION = 0x0400 }; - // Retrieves variables for information_schema.global_status. // Names (columnname) are automatically converted to upper case, and prefixed with "TOKUDB_" static int show_tokudb_vars(THD *thd, SHOW_VAR *var, char *buff) { @@ -2372,6 +2370,12 @@ static void tokudb_backtrace(void) { } #endif +#if defined(TOKUDB_VERSION_MAJOR) && defined(TOKUDB_VERSION_MINOR) +#define TOKUDB_PLUGIN_VERSION ((TOKUDB_VERSION_MAJOR << 8) + TOKUDB_VERSION_MINOR) +#else +#define TOKUDB_PLUGIN_VERSION 0 +#endif + mysql_declare_plugin(tokudb) { MYSQL_STORAGE_ENGINE_PLUGIN, @@ -2382,7 +2386,7 @@ mysql_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_init_func, /* plugin init */ tokudb_done_func, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, toku_global_status_variables_export, /* status variables */ tokudb_system_variables, /* system variables */ NULL, /* config options */ @@ -2399,7 +2403,7 @@ mysql_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_trx_init, /* plugin init */ tokudb_trx_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ NULL, /* config options */ @@ -2416,7 +2420,7 @@ mysql_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_lock_waits_init, /* plugin init */ tokudb_lock_waits_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ NULL, /* config options */ @@ -2433,7 +2437,7 @@ mysql_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_locks_init, /* plugin init */ tokudb_locks_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ NULL, /* config options */ @@ -2450,7 +2454,7 @@ mysql_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_file_map_init, /* plugin init */ tokudb_file_map_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ NULL, /* config options */ @@ -2467,7 +2471,7 @@ mysql_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_fractal_tree_info_init, /* plugin init */ tokudb_fractal_tree_info_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ NULL, /* config options */ @@ -2484,7 +2488,7 @@ mysql_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_fractal_tree_block_map_init, /* plugin init */ tokudb_fractal_tree_block_map_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ NULL, /* config options */ @@ -2512,7 +2516,7 @@ maria_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_init_func, /* plugin init */ tokudb_done_func, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, toku_global_status_variables_export, /* status variables */ tokudb_system_variables, /* system variables */ TOKUDB_PLUGIN_VERSION_STR, /* string version */ @@ -2527,7 +2531,7 @@ maria_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_trx_init, /* plugin init */ tokudb_trx_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ TOKUDB_PLUGIN_VERSION_STR, /* string version */ @@ -2542,7 +2546,7 @@ maria_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_lock_waits_init, /* plugin init */ tokudb_lock_waits_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ TOKUDB_PLUGIN_VERSION_STR, /* string version */ @@ -2557,7 +2561,7 @@ maria_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_locks_init, /* plugin init */ tokudb_locks_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ TOKUDB_PLUGIN_VERSION_STR, /* string version */ @@ -2572,7 +2576,7 @@ maria_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_file_map_init, /* plugin init */ tokudb_file_map_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ TOKUDB_PLUGIN_VERSION_STR, /* string version */ @@ -2587,7 +2591,7 @@ maria_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_fractal_tree_info_init, /* plugin init */ tokudb_fractal_tree_info_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ TOKUDB_PLUGIN_VERSION_STR, /* string version */ @@ -2602,7 +2606,7 @@ maria_declare_plugin(tokudb) PLUGIN_LICENSE_GPL, tokudb_fractal_tree_block_map_init, /* plugin init */ tokudb_fractal_tree_block_map_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ + TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ TOKUDB_PLUGIN_VERSION_STR, /* string version */ From cfbe8342daded70dc8a7e6830e8827f311fb8746 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Fri, 17 Oct 2014 21:23:17 -0400 Subject: [PATCH 3/4] DB-742 use consistent version macros --- storage/tokudb/CMakeLists.txt | 6 +++--- storage/tokudb/hatoku_hton.cc | 28 +++++++++++++--------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 2c13d64fe7a..faeb50f924f 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -24,12 +24,12 @@ IF(NOT DEFINED TOKUDB_VERSION) ENDIF() ENDIF() IF(DEFINED TOKUDB_VERSION) - ADD_DEFINITIONS("-DTOKUDB_VERSION=\"${TOKUDB_VERSION}\"") + ADD_DEFINITIONS("-DTOKUDB_VERSION=${TOKUDB_VERSION}") IF (${TOKUDB_VERSION} MATCHES "^tokudb-([0-9]+)\\.([0-9]+)\\.([0-9]+.*)") ADD_DEFINITIONS("-DTOKUDB_VERSION_MAJOR=${CMAKE_MATCH_1}") ADD_DEFINITIONS("-DTOKUDB_VERSION_MINOR=${CMAKE_MATCH_2}") - ADD_DEFINITIONS("-DTOKUDB_VERSION_PATCH=\"${CMAKE_MATCH_3}\"") - ENDIF() + ADD_DEFINITIONS("-DTOKUDB_VERSION_PATCH=${CMAKE_MATCH_3}") + ENDIF() ENDIF() IF(DEFINED TOKUDB_NOPATCH_CONFIG) diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index 048a5ca5172..f1d4a838c98 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -264,11 +264,15 @@ static uint32_t tokudb_checkpointing_period; static uint32_t tokudb_fsync_log_period; uint32_t tokudb_write_status_frequency; uint32_t tokudb_read_status_frequency; + #ifdef TOKUDB_VERSION -char *tokudb_version = (char*) TOKUDB_VERSION; +#define tokudb_stringify_2(x) #x +#define tokudb_stringify(x) tokudb_stringify_2(x) +#define TOKUDB_VERSION_STR tokudb_stringify(TOKUDB_VERSION) #else -char *tokudb_version; +#define TOKUDB_VERSION_STR NULL #endif +char *tokudb_version = (char *) TOKUDB_VERSION_STR; static int tokudb_fs_reserve_percent; // file system reserve as a percentage of total disk space #if defined(_WIN32) @@ -2500,12 +2504,6 @@ mysql_declare_plugin_end; #ifdef MARIA_PLUGIN_INTERFACE_VERSION -#ifdef TOKUDB_VERSION -#define TOKUDB_PLUGIN_VERSION_STR TOKUDB_VERSION -#else -#define TOKUDB_PLUGIN_VERSION_STR NULL -#endif - maria_declare_plugin(tokudb) { MYSQL_STORAGE_ENGINE_PLUGIN, @@ -2519,7 +2517,7 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, toku_global_status_variables_export, /* status variables */ tokudb_system_variables, /* system variables */ - TOKUDB_PLUGIN_VERSION_STR, /* string version */ + tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ }, { @@ -2534,7 +2532,7 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ - TOKUDB_PLUGIN_VERSION_STR, /* string version */ + tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ }, { @@ -2549,7 +2547,7 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ - TOKUDB_PLUGIN_VERSION_STR, /* string version */ + tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ }, { @@ -2564,7 +2562,7 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ - TOKUDB_PLUGIN_VERSION_STR, /* string version */ + tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ }, { @@ -2579,7 +2577,7 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ - TOKUDB_PLUGIN_VERSION_STR, /* string version */ + tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ }, { @@ -2594,7 +2592,7 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ - TOKUDB_PLUGIN_VERSION_STR, /* string version */ + tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ }, { @@ -2609,7 +2607,7 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ - TOKUDB_PLUGIN_VERSION_STR, /* string version */ + tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } maria_declare_plugin_end; From c5bf055079b9dc289fcf642d6db867dca17ca4b2 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Sat, 18 Oct 2014 10:58:38 -0400 Subject: [PATCH 4/4] DB-742 combine mysql and mariadb plugin declarations --- storage/tokudb/hatoku_hton.cc | 169 +++++++++------------------------- 1 file changed, 43 insertions(+), 126 deletions(-) diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index f1d4a838c98..bef9b36e4de 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -2380,131 +2380,11 @@ static void tokudb_backtrace(void) { #define TOKUDB_PLUGIN_VERSION 0 #endif -mysql_declare_plugin(tokudb) -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &tokudb_storage_engine, - tokudb_hton_name, - "Tokutek Inc", - "Tokutek TokuDB Storage Engine with Fractal Tree(tm) Technology", - PLUGIN_LICENSE_GPL, - tokudb_init_func, /* plugin init */ - tokudb_done_func, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, - toku_global_status_variables_export, /* status variables */ - tokudb_system_variables, /* system variables */ - NULL, /* config options */ -#if MYSQL_VERSION_ID >= 50521 - 0, /* flags */ -#endif -}, -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &tokudb_trx_information_schema, - "TokuDB_trx", - "Tokutek Inc", - "Tokutek TokuDB Storage Engine with Fractal Tree(tm) Technology", - PLUGIN_LICENSE_GPL, - tokudb_trx_init, /* plugin init */ - tokudb_trx_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ -#if MYSQL_VERSION_ID >= 50521 - 0, /* flags */ -#endif -}, -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &tokudb_lock_waits_information_schema, - "TokuDB_lock_waits", - "Tokutek Inc", - "Tokutek TokuDB Storage Engine with Fractal Tree(tm) Technology", - PLUGIN_LICENSE_GPL, - tokudb_lock_waits_init, /* plugin init */ - tokudb_lock_waits_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ -#if MYSQL_VERSION_ID >= 50521 - 0, /* flags */ -#endif -}, -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &tokudb_locks_information_schema, - "TokuDB_locks", - "Tokutek Inc", - "Tokutek TokuDB Storage Engine with Fractal Tree(tm) Technology", - PLUGIN_LICENSE_GPL, - tokudb_locks_init, /* plugin init */ - tokudb_locks_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ -#if MYSQL_VERSION_ID >= 50521 - 0, /* flags */ -#endif -}, -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &tokudb_file_map_information_schema, - "TokuDB_file_map", - "Tokutek Inc", - "Tokutek TokuDB Storage Engine with Fractal Tree(tm) Technology", - PLUGIN_LICENSE_GPL, - tokudb_file_map_init, /* plugin init */ - tokudb_file_map_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ -#if MYSQL_VERSION_ID >= 50521 - 0, /* flags */ -#endif -}, -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &tokudb_fractal_tree_info_information_schema, - "TokuDB_fractal_tree_info", - "Tokutek Inc", - "Tokutek TokuDB Storage Engine with Fractal Tree(tm) Technology", - PLUGIN_LICENSE_GPL, - tokudb_fractal_tree_info_init, /* plugin init */ - tokudb_fractal_tree_info_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ -#if MYSQL_VERSION_ID >= 50521 - 0, /* flags */ -#endif -}, -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &tokudb_fractal_tree_block_map_information_schema, - "TokuDB_fractal_tree_block_map", - "Tokutek Inc", - "Tokutek TokuDB Storage Engine with Fractal Tree(tm) Technology", - PLUGIN_LICENSE_GPL, - tokudb_fractal_tree_block_map_init, /* plugin init */ - tokudb_fractal_tree_block_map_done, /* plugin deinit */ - TOKUDB_PLUGIN_VERSION, - NULL, /* status variables */ - NULL, /* system variables */ - NULL, /* config options */ -#if MYSQL_VERSION_ID >= 50521 - 0, /* flags */ -#endif -} -mysql_declare_plugin_end; - #ifdef MARIA_PLUGIN_INTERFACE_VERSION - maria_declare_plugin(tokudb) +#else +mysql_declare_plugin(tokudb) +#endif { MYSQL_STORAGE_ENGINE_PLUGIN, &tokudb_storage_engine, @@ -2517,8 +2397,13 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, toku_global_status_variables_export, /* status variables */ tokudb_system_variables, /* system variables */ +#ifdef MARIA_PLUGIN_INTERFACE_VERSION tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +#else + NULL, /* config options */ + 0, /* flags */ +#endif }, { MYSQL_INFORMATION_SCHEMA_PLUGIN, @@ -2532,8 +2417,13 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ +#ifdef MARIA_PLUGIN_INTERFACE_VERSION tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +#else + NULL, /* config options */ + 0, /* flags */ +#endif }, { MYSQL_INFORMATION_SCHEMA_PLUGIN, @@ -2547,8 +2437,13 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ +#ifdef MARIA_PLUGIN_INTERFACE_VERSION tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +#else + NULL, /* config options */ + 0, /* flags */ +#endif }, { MYSQL_INFORMATION_SCHEMA_PLUGIN, @@ -2562,8 +2457,13 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ +#ifdef MARIA_PLUGIN_INTERFACE_VERSION tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +#else + NULL, /* config options */ + 0, /* flags */ +#endif }, { MYSQL_INFORMATION_SCHEMA_PLUGIN, @@ -2577,8 +2477,13 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ +#ifdef MARIA_PLUGIN_INTERFACE_VERSION tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +#else + NULL, /* config options */ + 0, /* flags */ +#endif }, { MYSQL_INFORMATION_SCHEMA_PLUGIN, @@ -2592,8 +2497,13 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ +#ifdef MARIA_PLUGIN_INTERFACE_VERSION tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +#else + NULL, /* config options */ + 0, /* flags */ +#endif }, { MYSQL_INFORMATION_SCHEMA_PLUGIN, @@ -2607,9 +2517,16 @@ maria_declare_plugin(tokudb) TOKUDB_PLUGIN_VERSION, NULL, /* status variables */ NULL, /* system variables */ +#ifdef MARIA_PLUGIN_INTERFACE_VERSION tokudb_version, MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ -} -maria_declare_plugin_end; - +#else + NULL, /* config options */ + 0, /* flags */ +#endif +} +#ifdef MARIA_PLUGIN_INTERFACE_VERSION +maria_declare_plugin_end; +#else +mysql_declare_plugin_end; #endif