MDEV-26282 Make the version of Spider the same as the server version

Spider is now a part of the server. So, it doesn't make sense for Spider to have its own version number apart from the server's one.
MariaDB · Jun 8, 2022 · 8c4a2c8 · 8c4a2c8
1 parent 5a33a37
commit 8c4a2c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h
@@ -14,8 +14,8 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
-#define SPIDER_DETAIL_VERSION "3.3.15"
-#define SPIDER_HEX_VERSION 0x0303
+#define SPIDER_DETAIL_VERSION PACKAGE_VERSION
+#define SPIDER_HEX_VERSION (MYSQL_VERSION_MAJOR << 8 | MYSQL_VERSION_MINOR)
 
 #define spider_my_free(A,B) my_free(A)
 #ifdef pthread_mutex_t

diff --git a/storage/spider/spd_param.cc b/storage/spider/spd_param.cc
@@ -2674,17 +2674,6 @@ uint spider_param_log_result_error_with_sql()
   DBUG_RETURN(spider_log_result_error_with_sql);
 }
 
-static char *spider_version = (char *) SPIDER_DETAIL_VERSION;
-static MYSQL_SYSVAR_STR(
-  version,
-  spider_version,
-  PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
-  "The version of Spider",
-  NULL,
-  NULL,
-  SPIDER_DETAIL_VERSION
-);
-
 /*
   0: server_id + thread_id
   1: server_id + thread_id + query_id
@@ -3213,7 +3202,6 @@ static struct st_mysql_sys_var* spider_system_variables[] = {
   MYSQL_SYSVAR(conn_wait_timeout),
   MYSQL_SYSVAR(log_result_errors),
   MYSQL_SYSVAR(log_result_error_with_sql),
-  MYSQL_SYSVAR(version),
   MYSQL_SYSVAR(internal_xa_id_type),
   MYSQL_SYSVAR(casual_read),
   MYSQL_SYSVAR(dry_access),