]>
Commit | Line | Data |
---|---|---|
b48a4bd6 | 1 | --- mysql-5.0.68/libmysqld/log.cc~ 2008-08-13 12:14:31.000000000 +0300 |
2 | +++ mysql-5.0.68/libmysqld/log.cc 2008-10-27 15:02:24.136737667 +0200 | |
3 | @@ -2543,11 +2543,11 @@ | |
4 | bool result=0; | |
5 | if (opt_error_log) | |
6 | { | |
7 | + VOID(pthread_mutex_lock(&LOCK_error_log)); | |
8 | +#ifdef __WIN__ | |
9 | char err_renamed[FN_REFLEN], *end; | |
10 | end= strmake(err_renamed,log_error_file,FN_REFLEN-4); | |
11 | strmov(end, "-old"); | |
12 | - VOID(pthread_mutex_lock(&LOCK_error_log)); | |
13 | -#ifdef __WIN__ | |
14 | char err_temp[FN_REFLEN+4]; | |
15 | /* | |
16 | On Windows is necessary a temporary file for to rename | |
aed0a25d AM |
17 | @@ -2619,7 +2619,6 @@ |
18 | { | |
19 | freopen(err_temp,"a+",stderr); | |
20 | (void) my_delete(err_renamed, MYF(0)); | |
21 | - my_rename(log_error_file,err_renamed,MYF(0)); | |
22 | if (freopen(log_error_file,"a+",stdout)) | |
23 | freopen(log_error_file,"a+",stderr); | |
24 | int fd, bytes; | |
9c463e47 ER |
25 | --- mysql-5.0.68/sql/log.cc~ 2008-10-27 13:41:07.000000000 +0200 |
26 | +++ mysql-5.0.68/sql/log.cc 2008-10-27 15:07:07.918167174 +0200 | |
27 | @@ -2592,11 +2592,11 @@ | |
28 | bool result=0; | |
29 | if (opt_error_log) | |
30 | { | |
31 | + VOID(pthread_mutex_lock(&LOCK_error_log)); | |
32 | +#ifdef __WIN__ | |
33 | char err_renamed[FN_REFLEN], *end; | |
34 | end= strmake(err_renamed,log_error_file,FN_REFLEN-4); | |
35 | strmov(end, "-old"); | |
36 | - VOID(pthread_mutex_lock(&LOCK_error_log)); | |
37 | -#ifdef __WIN__ | |
38 | char err_temp[FN_REFLEN+4]; | |
39 | /* | |
40 | On Windows is necessary a temporary file for to rename | |
aed0a25d | 41 | @@ -2635,7 +2635,6 @@ |
9c463e47 ER |
42 | result= 1; |
43 | #else | |
aed0a25d | 44 | FILE *reopen; |
9c463e47 ER |
45 | - my_rename(log_error_file,err_renamed,MYF(0)); |
46 | if (freopen(log_error_file,"a+",stdout)) | |
aed0a25d | 47 | reopen= freopen(log_error_file,"a+",stderr); |
9c463e47 | 48 | else |
aed0a25d | 49 |