- up to 5.0.86

Changed files:
    mysql-errorlog-no-rename.patch -> 1.1.2.2
    mysql.spec -> 1.353.2.80

diff --git a/mysql-errorlog-no-rename.patch b/mysql-errorlog-no-rename.patch
index b3c4cf48e4c1215cc56274e04f9df7fbded0acd1..c0da3a26e4e546385ead31db4f69606ba604993a 100644 (file)
--- a/mysql-errorlog-no-rename.patch
+++ b/mysql-errorlog-no-rename.patch
@@ -14,14 +14,14 @@
      char err_temp[FN_REFLEN+4];
      /*
       On Windows is necessary a temporary file for to rename
-@@ -2575,7 +2575,6 @@
-     else
-      result= 1;
- #else
--   my_rename(log_error_file,err_renamed,MYF(0));
-    if (freopen(log_error_file,"a+",stdout))
-      freopen(log_error_file,"a+",stderr);
-    else
+@@ -2619,7 +2619,6 @@
+     {
+       freopen(err_temp,"a+",stderr);
+       (void) my_delete(err_renamed, MYF(0));
+-      my_rename(log_error_file,err_renamed,MYF(0));
+       if (freopen(log_error_file,"a+",stdout))
+         freopen(log_error_file,"a+",stderr);
+       int fd, bytes;
 --- mysql-5.0.68/sql/log.cc~   2008-10-27 13:41:07.000000000 +0200
 +++ mysql-5.0.68/sql/log.cc    2008-10-27 15:07:07.918167174 +0200
 @@ -2592,11 +2592,11 @@
@@ -38,11 +38,12 @@
      char err_temp[FN_REFLEN+4];
      /*
       On Windows is necessary a temporary file for to rename
-@@ -2624,7 +2624,6 @@
-     else
+@@ -2635,7 +2635,6 @@
       result= 1;
  #else
+    FILE *reopen;
 -   my_rename(log_error_file,err_renamed,MYF(0));
     if (freopen(log_error_file,"a+",stdout))
-      freopen(log_error_file,"a+",stderr);
+        reopen= freopen(log_error_file,"a+",stderr);
     else
+

diff --git a/mysql.spec b/mysql.spec
index 9d8e1c5d4c3c382e8aa6b8329134d00070a02ef1..8521207891bc2bca5e1afa937af504e10946b146 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -25,13 +25,13 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.0.85
+Version:       5.0.86
 Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 #Source0:      ftp://ftp.mysql.com/pub/mysql/src/%{name}-%{version}.tar.gz
 Source0:       http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
-# Source0-md5: f672ec5154f8ea3db87fec5e0b227f4c
+# Source0-md5: c1f746bfbc8c2cb3ec1e0427a8a88c55
 #Source0:      http://mysql.he.net/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
 #Source0:      http://mirror.provenscaling.com/mysql/enterprise/source/5.0/%{name}-%{version}.tar.gz
 Source100:     http://www.sphinxsearch.com/downloads/sphinx-0.9.9-rc2.tar.gz
@@ -721,12 +721,10 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/safe_mysqld*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1*
 rm $RPM_BUILD_ROOT%{_bindir}/resolveip
 rm $RPM_BUILD_ROOT%{_mandir}/man1/resolveip.1*
-rm $RPM_BUILD_ROOT%{_mandir}/man1/make_win_bin_dist.1
 rm $RPM_BUILD_ROOT%{_bindir}/comp_err
 rm $RPM_BUILD_ROOT%{_mandir}/man1/comp_err.1
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_install_db.1
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_waitpid.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/make_win_src_distribution.1
 rm $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld_multi.server
 
 # no package for tests
@@ -734,9 +732,6 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql-stress-test.pl.1
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql-test-run.pl.1
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_client_test_embedded.1
 # orphaned manuals
-rm $RPM_BUILD_ROOT%{_mandir}/man1/ndb_print_backup_file.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/ndb_print_schema_file.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/ndb_print_sys_file.1
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqltest_embedded.1
 
 # in %doc