diff options
| author | unknown <monty@mysql.com> | 2003-11-26 03:32:39 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-26 03:32:39 +0200 |
| commit | 292cb97e964f95498396555d27bee1ef707b8797 (patch) | |
| tree | 9769e8062852fda488ba1bd1a7d9aaa228f9f1e7 | |
| parent | 7885184292a82008342997b334702219338297a0 (diff) | |
| parent | e56d603a098f8082785329249af73209eb52b8fb (diff) | |
| download | mariadb-git-292cb97e964f95498396555d27bee1ef707b8797.tar.gz | |
Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1
include/mysql_version.h.in:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
| -rw-r--r-- | include/mysql_version.h.in | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | 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 31bf2bdd00d..095531d527d 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 */ #endif /* _CUSTOMCONFIG_ */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b811c4a4b67..9b31e35f90c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4825,8 +4825,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 9b7be4afacc..39dc92c5d33 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -740,6 +740,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} }; |