Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.test

sql/log.cc

@@ -1260,6 +1260,7 @@ err:
   }
 
   pthread_mutex_unlock(&LOCK_log);
+#ifdef HAVE_REPLICATION
   if (should_rotate && expire_logs_days)
   {
     long purge_time= time(0) - expire_logs_days*24*60*60;
@@ -1267,6 +1268,7 @@ err:
       error= purge_logs_before_date(current_thd, purge_time);
   }
 
+#endif
   DBUG_RETURN(error);
 }
 

sql/mysqld.cc

@@ -2176,12 +2176,14 @@ static int init_server_components()
     open_log(&mysql_bin_log, glob_hostname, opt_bin_logname, "-bin",
 	     opt_binlog_index_name,LOG_BIN);
     using_update_log=1;
+#ifdef HAVE_REPLICATION
     if (expire_logs_days)
     {
       long purge_time= time(0) - expire_logs_days*24*60*60;
       if (purge_time >= 0)
 	mysql_bin_log.purge_logs_before_date(current_thd, purge_time);
     }
+#endif
   }
 
   if (opt_error_log)

sql/sql_parse.cc

@@ -3940,12 +3940,14 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables)
     mysql_log.new_file(1);
     mysql_update_log.new_file(1);
     mysql_bin_log.new_file(1);
+#ifdef HAVE_REPLICATION
     if (expire_logs_days)
     {
       long purge_time= time(0) - expire_logs_days*24*60*60;
       if (purge_time >= 0)
 	mysql_bin_log.purge_logs_before_date(thd, purge_time);
     }
+#endif
     mysql_slow_log.new_file(1);
     if (ha_flush_logs())
       result=1;