Simple cleanups

- Add 'stage name' to debug output

sql/sql_class.h

@@ -2193,12 +2193,13 @@ class THD :public Statement,
                    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

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;
   }