bzr commit into mysql-5.5-bugteam branch (azundris:3229) Bug#48387

[Tatiana Azundris Nurnberg]

#At file:///Users/tnurnberg/forest/48387/55-48387/ based on revid:dao-gang.qu@stripped

 3229 Tatiana Azundris Nurnberg	2011-01-20
      Bug#48387: Log the start and stop of init_file execution
      
      Parenthesizes init-file results, if any, with the file's name
      in the log so it's more obvious where the statements were read
      from.

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-12-29 00:26:31 +0000
+++ b/sql/mysqld.cc	2011-01-20 11:42:03 +0000
@@ -4864,11 +4864,17 @@ static bool read_init_file(char *file_na
   MYSQL_FILE *file;
   DBUG_ENTER("read_init_file");
   DBUG_PRINT("enter",("name: %s",file_name));
+
+  sql_print_information("Execution of init_file \'%s\' started.", file_name);
+
   if (!(file= mysql_file_fopen(key_file_init, file_name,
                                O_RDONLY, MYF(MY_WME))))
     DBUG_RETURN(TRUE);
   bootstrap(file);
   mysql_file_fclose(file, MYF(MY_WME));
+
+  sql_print_information("Execution of init_file \'%s\' ended.", file_name);
+
   DBUG_RETURN(FALSE);
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]