bzr commit into mysql-5.1 branch (kpettersson:2665)

[Kristofer Pettersson]

#At file:///home/thek/Development/cpp/mysqlbzr/mysql-5.1-bugteam/

 2665 Kristofer Pettersson	2008-07-22 [merge]
      (no message)
modified:
  sql/log.cc

per-file messages:
  sql/log.cc
    Auto merge
=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-07-21 14:41:17 +0000
+++ b/sql/log.cc	2008-07-22 10:41:55 +0000
@@ -3096,7 +3096,7 @@ int MYSQL_BIN_LOG::purge_logs(const char
         /*
           It's not fatal if we can't stat a log file that does not exist;
           If we could not stat, we won't delete.
-        */     
+        */
         if (thd)
         {
           push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
@@ -3235,6 +3235,7 @@ int MYSQL_BIN_LOG::purge_logs_before_dat
   LOG_INFO log_info;
   MY_STAT stat_area;
   THD *thd= current_thd;
+  
   DBUG_ENTER("purge_logs_before_date");
 
   pthread_mutex_lock(&LOCK_index);
@@ -3263,8 +3264,8 @@ int MYSQL_BIN_LOG::purge_logs_before_dat
                               ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
                               log_info.log_file_name);
         }
-	sql_print_information("Failed to execute my_stat on file '%s'",
-			      log_info.log_file_name);
+        sql_print_information("Failed to execute my_stat on file '%s'",
+                              log_info.log_file_name);
         my_errno= 0;
       }
       else