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

Simple cleanups

Browse Source 
- Add 'stage name' to debug output
This commit is contained in:
Monty
2017-11-05 20:05:41 +02:00
parent bce807f70f
commit 99a2870905
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -2193,12 +2193,13 @@ public:
const char *calling_file, const char *calling_file,
const unsigned int calling_line) const unsigned int calling_line)
{ {
DBUG_PRINT("THD::enter_stage", ("%s:%d", calling_file, calling_line)); DBUG_PRINT("THD::enter_stage", ("%s at %s:%d", stage->m_name,
calling_file, calling_line));
DBUG_ASSERT(stage); DBUG_ASSERT(stage);
m_current_stage_key= stage->m_key; m_current_stage_key= stage->m_key;
proc_info= stage->m_name; proc_info= stage->m_name;
#if defined(ENABLED_PROFILING) #if defined(ENABLED_PROFILING)
profiling.status_change(stage->m_name, calling_func, calling_file, profiling.status_change(proc_info, calling_func, calling_file,
calling_line); calling_line);
#endif #endif
#ifdef HAVE_PSI_THREAD_INTERFACE #ifdef HAVE_PSI_THREAD_INTERFACE

11
sql/winservice.c
View File

@ -147,12 +147,13 @@ int get_mysql_service_properties(const wchar_t *bin_path,
if(numargs == 2) if(numargs == 2)
{ {
/* /*
There are rare cases where service config does not have There are rare cases where service config does not have
--defaults-filein the binary parth . There services were registered with --defaults-file in the binary parth . There services were
plain mysqld --install, the data directory is next to "bin" in this case. registered with plain mysqld --install, the data directory is
Service name (second parameter) must be MySQL. next to "bin" in this case. Service name (second parameter)
must be MySQL.
*/ */
if(wcscmp(args[1], L"MySQL") != 0) if (wcscmp(args[1], L"MySQL") != 0)
goto end; goto end;
have_inifile= FALSE; have_inifile= FALSE;
} }