diff options
| -rw-r--r-- | sql/sql_class.h | 5 | ||||
| -rw-r--r-- | sql/winservice.c | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 93bfe475802..71be5ad042e 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2193,12 +2193,13 @@ public: const char *calling_file, 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); m_current_stage_key= stage->m_key; proc_info= stage->m_name; #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); #endif #ifdef HAVE_PSI_THREAD_INTERFACE diff --git a/sql/winservice.c b/sql/winservice.c index efbbb527c9b..388ea886cea 100644 --- a/sql/winservice.c +++ b/sql/winservice.c @@ -147,12 +147,13 @@ int get_mysql_service_properties(const wchar_t *bin_path, if(numargs == 2) { /* - There are rare cases where service config does not have - --defaults-filein the binary parth . There services were registered with - plain mysqld --install, the data directory is next to "bin" in this case. - Service name (second parameter) must be MySQL. + There are rare cases where service config does not have + --defaults-file in the binary parth . There services were + registered with plain mysqld --install, the data directory is + 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; have_inifile= FALSE; } |