From e1d80b9f43728921d3d90aedeccc570f38e1ff42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 1 Feb 2010 12:58:59 +0000 Subject: [PATCH] - reviewed for 5.1.43 Changed files: mysql-errorlog-no-rename.patch -> 1.4 --- mysql-errorlog-no-rename.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mysql-errorlog-no-rename.patch b/mysql-errorlog-no-rename.patch index 93a64ea..2b61b8a 100644 --- a/mysql-errorlog-no-rename.patch +++ b/mysql-errorlog-no-rename.patch @@ -1,19 +1,20 @@ ---- mysql-5.1.28-rc/sql/log.cc~ 2008-08-28 18:40:55.000000000 +0300 -+++ mysql-5.1.28-rc/sql/log.cc 2008-10-27 15:06:13.528944807 +0200 -@@ -5021,10 +5021,10 @@ +--- mysql-5.1.43/sql/log.cc~ 2010-01-15 19:17:28.000000000 +0200 ++++ mysql-5.1.43/sql/log.cc 2010-02-01 14:53:55.026725423 +0200 +@@ -5020,11 +5042,11 @@ + bool result=0; if (opt_error_log) { ++ VOID(pthread_mutex_lock(&LOCK_error_log)); ++#ifdef __WIN__ char err_renamed[FN_REFLEN], *end; -- end= strmake(err_renamed,log_error_file,FN_REFLEN-5); -- strmov(end, "-old"); - VOID(pthread_mutex_lock(&LOCK_error_log)); - #ifdef __WIN__ -+ end= strmake(err_renamed,log_error_file,FN_REFLEN-5); -+ strmov(end, "-old"); + end= strmake(err_renamed,log_error_file,FN_REFLEN-5); + strmov(end, "-old"); +- VOID(pthread_mutex_lock(&LOCK_error_log)); +-#ifdef __WIN__ char err_temp[FN_REFLEN+5]; /* On Windows is necessary a temporary file for to rename -@@ -5060,7 +5059,6 @@ +@@ -5060,7 +5082,6 @@ else result= 1; #else @@ -21,4 +22,3 @@ if (freopen(log_error_file,"a+",stdout)) { FILE *reopen; - -- 2.44.0