From ed6e446225a8ee942f8acfdc6074158425c370a1 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Wed, 26 Nov 2003 03:30:00 +0200
Subject: Added compilation comment to 'show variables' This makes it possible
 to check origin of binary from the output of 'show variables'

---
 include/mysql_version.h.in | 1 +
 sql/mysqld.cc              | 4 ++--
 sql/set_var.cc             | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in
index da184665f6e..41d4ce081fb 100644
--- a/include/mysql_version.h.in
+++ b/include/mysql_version.h.in
@@ -19,6 +19,7 @@
 #define MYSQL_PORT			@MYSQL_TCP_PORT@
 #define MYSQL_UNIX_ADDR			"@MYSQL_UNIX_ADDR@"
 #define MYSQL_CONFIG_NAME		"my"
+#define MYSQL_COMPILATION_COMMENT	"@COMPILATION_COMMENT@"
 
 /* mysqld compile time options */
 #ifndef MYSQL_CHARSET
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e5ddbfe7a33..4c6cf1d5039 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4278,8 +4278,8 @@ struct show_var_st status_vars[]= {
 
 static void print_version(void)
 {
-  printf("%s  Ver %s for %s on %s\n",my_progname,
-	 server_version,SYSTEM_TYPE,MACHINE_TYPE);
+  printf("%s  Ver %s for %s on %s (%s)\n",my_progname,
+	 server_version,SYSTEM_TYPE,MACHINE_TYPE, MYSQL_COMPILATION_COMMENT);
 }
 
 static void use_help(void)
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 03651967a7a..4aea611e401 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -593,6 +593,7 @@ struct show_var_st init_vars[]= {
    SHOW_SYS},
   {sys_trans_prealloc_size.name, (char*) &sys_trans_prealloc_size,  SHOW_SYS},
   {"version",                 server_version,                       SHOW_CHAR},
+  {"version_comment",         (char*) MYSQL_COMPILATION_COMMENT,    SHOW_CHAR},
   {sys_net_wait_timeout.name, (char*) &sys_net_wait_timeout,	    SHOW_SYS},
   {NullS, NullS, SHOW_LONG}
 };
-- 
cgit v1.2.1