Skip to content

M
MariaDB
Commit 57883124 authored by Rich Prohaska's avatar Rich Prohaska
Browse files
Options

DB-742 set plugin version to tokudb_version_major.tokudb_version_minor

parent 178a5112
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 16 deletions
storage/tokudb/CMakeLists.txt
View file @ 57883124
...@@ -25,6 +25,11 @@ IF(NOT DEFINED TOKUDB_VERSION) ...@@ -25,6 +25,11 @@ IF(NOT DEFINED TOKUDB_VERSION)
ENDIF() ENDIF()
IF(DEFINED TOKUDB_VERSION) 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()
ENDIF() ENDIF()
IF(DEFINED TOKUDB_NOPATCH_CONFIG) IF(DEFINED TOKUDB_NOPATCH_CONFIG)
......
storage/tokudb/hatoku_hton.cc
View file @ 57883124
...@@ -2272,8 +2272,6 @@ static int tokudb_locks_done(void *p) { ...@@ -2272,8 +2272,6 @@ static int tokudb_locks_done(void *p) {
return 0; return 0;
} }
enum { TOKUDB_PLUGIN_VERSION = 0x0400 };
// Retrieves variables for information_schema.global_status. // Retrieves variables for information_schema.global_status.
// Names (columnname) are automatically converted to upper case, and prefixed with "TOKUDB_" // Names (columnname) are automatically converted to upper case, and prefixed with "TOKUDB_"
static int show_tokudb_vars(THD *thd, SHOW_VAR *var, char *buff) { static int show_tokudb_vars(THD *thd, SHOW_VAR *var, char *buff) {
...@@ -2372,6 +2370,12 @@ static void tokudb_backtrace(void) { ...@@ -2372,6 +2370,12 @@ static void tokudb_backtrace(void) {
} }
#endif #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_declare_plugin(tokudb)
{ {
MYSQL_STORAGE_ENGINE_PLUGIN, MYSQL_STORAGE_ENGINE_PLUGIN,
...@@ -2382,7 +2386,7 @@ mysql_declare_plugin(tokudb) ...@@ -2382,7 +2386,7 @@ mysql_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_init_func, /* plugin init */ tokudb_init_func, /* plugin init */
tokudb_done_func, /* plugin deinit */ tokudb_done_func, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
toku_global_status_variables_export, /* status variables */ toku_global_status_variables_export, /* status variables */
tokudb_system_variables, /* system variables */ tokudb_system_variables, /* system variables */
NULL, /* config options */ NULL, /* config options */
...@@ -2399,7 +2403,7 @@ mysql_declare_plugin(tokudb) ...@@ -2399,7 +2403,7 @@ mysql_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_trx_init, /* plugin init */ tokudb_trx_init, /* plugin init */
tokudb_trx_done, /* plugin deinit */ tokudb_trx_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
NULL, /* config options */ NULL, /* config options */
...@@ -2416,7 +2420,7 @@ mysql_declare_plugin(tokudb) ...@@ -2416,7 +2420,7 @@ mysql_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_lock_waits_init, /* plugin init */ tokudb_lock_waits_init, /* plugin init */
tokudb_lock_waits_done, /* plugin deinit */ tokudb_lock_waits_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
NULL, /* config options */ NULL, /* config options */
...@@ -2433,7 +2437,7 @@ mysql_declare_plugin(tokudb) ...@@ -2433,7 +2437,7 @@ mysql_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_locks_init, /* plugin init */ tokudb_locks_init, /* plugin init */
tokudb_locks_done, /* plugin deinit */ tokudb_locks_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
NULL, /* config options */ NULL, /* config options */
...@@ -2450,7 +2454,7 @@ mysql_declare_plugin(tokudb) ...@@ -2450,7 +2454,7 @@ mysql_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_file_map_init, /* plugin init */ tokudb_file_map_init, /* plugin init */
tokudb_file_map_done, /* plugin deinit */ tokudb_file_map_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
NULL, /* config options */ NULL, /* config options */
...@@ -2467,7 +2471,7 @@ mysql_declare_plugin(tokudb) ...@@ -2467,7 +2471,7 @@ mysql_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_fractal_tree_info_init, /* plugin init */ tokudb_fractal_tree_info_init, /* plugin init */
tokudb_fractal_tree_info_done, /* plugin deinit */ tokudb_fractal_tree_info_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
NULL, /* config options */ NULL, /* config options */
...@@ -2484,7 +2488,7 @@ mysql_declare_plugin(tokudb) ...@@ -2484,7 +2488,7 @@ mysql_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_fractal_tree_block_map_init, /* plugin init */ tokudb_fractal_tree_block_map_init, /* plugin init */
tokudb_fractal_tree_block_map_done, /* plugin deinit */ tokudb_fractal_tree_block_map_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
NULL, /* config options */ NULL, /* config options */
...@@ -2512,7 +2516,7 @@ maria_declare_plugin(tokudb) ...@@ -2512,7 +2516,7 @@ maria_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_init_func, /* plugin init */ tokudb_init_func, /* plugin init */
tokudb_done_func, /* plugin deinit */ tokudb_done_func, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
toku_global_status_variables_export, /* status variables */ toku_global_status_variables_export, /* status variables */
tokudb_system_variables, /* system variables */ tokudb_system_variables, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */ TOKUDB_PLUGIN_VERSION_STR, /* string version */
...@@ -2527,7 +2531,7 @@ maria_declare_plugin(tokudb) ...@@ -2527,7 +2531,7 @@ maria_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_trx_init, /* plugin init */ tokudb_trx_init, /* plugin init */
tokudb_trx_done, /* plugin deinit */ tokudb_trx_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */ TOKUDB_PLUGIN_VERSION_STR, /* string version */
...@@ -2542,7 +2546,7 @@ maria_declare_plugin(tokudb) ...@@ -2542,7 +2546,7 @@ maria_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_lock_waits_init, /* plugin init */ tokudb_lock_waits_init, /* plugin init */
tokudb_lock_waits_done, /* plugin deinit */ tokudb_lock_waits_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */ TOKUDB_PLUGIN_VERSION_STR, /* string version */
...@@ -2557,7 +2561,7 @@ maria_declare_plugin(tokudb) ...@@ -2557,7 +2561,7 @@ maria_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_locks_init, /* plugin init */ tokudb_locks_init, /* plugin init */
tokudb_locks_done, /* plugin deinit */ tokudb_locks_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */ TOKUDB_PLUGIN_VERSION_STR, /* string version */
...@@ -2572,7 +2576,7 @@ maria_declare_plugin(tokudb) ...@@ -2572,7 +2576,7 @@ maria_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_file_map_init, /* plugin init */ tokudb_file_map_init, /* plugin init */
tokudb_file_map_done, /* plugin deinit */ tokudb_file_map_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */ TOKUDB_PLUGIN_VERSION_STR, /* string version */
...@@ -2587,7 +2591,7 @@ maria_declare_plugin(tokudb) ...@@ -2587,7 +2591,7 @@ maria_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_fractal_tree_info_init, /* plugin init */ tokudb_fractal_tree_info_init, /* plugin init */
tokudb_fractal_tree_info_done, /* plugin deinit */ tokudb_fractal_tree_info_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */ TOKUDB_PLUGIN_VERSION_STR, /* string version */
...@@ -2602,7 +2606,7 @@ maria_declare_plugin(tokudb) ...@@ -2602,7 +2606,7 @@ maria_declare_plugin(tokudb)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
tokudb_fractal_tree_block_map_init, /* plugin init */ tokudb_fractal_tree_block_map_init, /* plugin init */
tokudb_fractal_tree_block_map_done, /* plugin deinit */ tokudb_fractal_tree_block_map_done, /* plugin deinit */
TOKUDB_PLUGIN_VERSION, /* 4.0.0 */ TOKUDB_PLUGIN_VERSION,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
TOKUDB_PLUGIN_VERSION_STR, /* string version */ TOKUDB_PLUGIN_VERSION_STR, /* string version */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7