diff options
| author | unknown <monty@mysql.com> | 2003-11-28 13:31:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-28 13:31:38 +0200 |
| commit | ef43220170521a90454c05380cc01d562fc98c2f (patch) | |
| tree | 995a8061976a12fd5dfb02679e683b86c743879c /sql/mysqld.cc | |
| parent | 03092d0c24067bf97359436e49e6cce7ca0e2803 (diff) | |
| parent | 183b02a8ac6074775bd8c33f036eed3cf6597bbe (diff) | |
| download | mariadb-git-ef43220170521a90454c05380cc01d562fc98c2f.tar.gz | |
Merge
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_derived.cc:
keep local copy
sql/sql_union.cc:
keep local copy
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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) |