bzr commit into mysql-trunk-bugfixing branch (azundris:3475)

[Tatiana Azundris Nurnberg]

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

 3475 Tatiana Azundris Nurnberg	2011-02-09 [merge]
      merge

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-12-29 00:38:59 +0000
+++ b/sql/mysqld.cc	2011-02-09 08:06:16 +0000
@@ -5119,11 +5119,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);
 }
 

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).