database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-9593 - Print the real version in the error log

Browse Source
This commit is contained in:
Sergey Vojtovich
2016-08-26 16:39:32 +04:00
parent 670760d504
commit dd31e5c6ab
3 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sql/mysqld.cc
View File

@ -4340,11 +4340,23 @@ static int init_common_variables()
if (get_options(&remaining_argc, &remaining_argv)) if (get_options(&remaining_argc, &remaining_argv))
return 1; return 1;
set_server_version(); if (IS_SYSVAR_AUTOSIZE(&server_version_ptr))
set_server_version(server_version, sizeof(server_version));
if (!opt_abort) if (!opt_abort)
sql_print_information("%s (mysqld %s) starting as process %lu ...", {
my_progname, server_version, (ulong) getpid()); if (IS_SYSVAR_AUTOSIZE(&server_version_ptr))
sql_print_information("%s (mysqld %s) starting as process %lu ...",
my_progname, server_version, (ulong) getpid());
else
{
char real_server_version[SERVER_VERSION_LENGTH];
set_server_version(real_server_version, sizeof(real_server_version));
sql_print_information("%s (mysqld %s as %s) starting as process %lu ...",
my_progname, real_server_version, server_version,
(ulong) getpid());
}
}
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (opt_abort && !opt_verbose) if (opt_abort && !opt_verbose)
@ -8571,7 +8583,8 @@ static bool add_many_options(DYNAMIC_ARRAY *options, my_option *list,
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
static void print_version(void) static void print_version(void)
{ {
set_server_version(); if (IS_SYSVAR_AUTOSIZE(&server_version_ptr))
set_server_version(server_version, sizeof(server_version));
printf("%s Ver %s for %s on %s (%s)\n",my_progname, printf("%s Ver %s for %s on %s (%s)\n",my_progname,
server_version,SYSTEM_TYPE,MACHINE_TYPE, MYSQL_COMPILATION_COMMENT); server_version,SYSTEM_TYPE,MACHINE_TYPE, MYSQL_COMPILATION_COMMENT);
@ -9680,24 +9693,17 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
(MYSQL_SERVER_SUFFIX is set by the compilation environment) (MYSQL_SERVER_SUFFIX is set by the compilation environment)
*/ */
void set_server_version(void) void set_server_version(char *buf, size_t size)
{ {
if (!IS_SYSVAR_AUTOSIZE(&server_version_ptr)) bool is_log= opt_log || global_system_variables.sql_log_slow || opt_bin_log;
return; bool is_debug= IF_DBUG(!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"), 0);
char *version_end= server_version+sizeof(server_version)-1; strxnmov(buf, size - 1,
char *end= strxnmov(server_version, sizeof(server_version)-1, MYSQL_SERVER_VERSION,
MYSQL_SERVER_VERSION, MYSQL_SERVER_SUFFIX_STR,
MYSQL_SERVER_SUFFIX_STR, NullS); IF_EMBEDDED("-embedded", ""),
#ifdef EMBEDDED_LIBRARY is_debug ? "-debug" : "",
end= strnmov(end, "-embedded", (version_end-end)); is_log ? "-log" : "",
#endif NullS);
#ifndef DBUG_OFF
if (!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"))
end= strnmov(end, "-debug", (version_end-end));
#endif
if (opt_log || global_system_variables.sql_log_slow || opt_bin_log)
strnmov(end, "-log", (version_end-end)); // This may slow down system
*end= 0;
} }

2
sql/mysqld.h
View File

@ -774,7 +774,7 @@ inline void dec_thread_running()
thread_safe_decrement32(&thread_running); thread_safe_decrement32(&thread_running);
} }
extern void set_server_version(void); extern void set_server_version(char *buf, size_t size);
#if defined(MYSQL_DYNAMIC_PLUGIN) && defined(_WIN32) #if defined(MYSQL_DYNAMIC_PLUGIN) && defined(_WIN32)
extern "C" THD *_current_thd_noinline(); extern "C" THD *_current_thd_noinline();

1
sql/signal_handler.cc
View File

@ -107,6 +107,7 @@ extern "C" sig_handler handle_fatal_signal(int sig)
"diagnose the problem, but since we have already crashed, \n" "diagnose the problem, but since we have already crashed, \n"
"something is definitely wrong and this may fail.\n\n"); "something is definitely wrong and this may fail.\n\n");
set_server_version(server_version, sizeof(server_version));
my_safe_printf_stderr("Server version: %s\n", server_version); my_safe_printf_stderr("Server version: %s\n", server_version);
if (dflt_key_cache) if (dflt_key_cache)