- up to 5.1.50

Changed files:
    mysql-abi_check.patch -> 1.2
    mysql-errorlog-no-rename.patch -> 1.5
    mysql-microslow.patch -> 1.7
    mysql.spec -> 1.491
    plugin-avoid-version.patch -> 1.3

diff --git a/mysql-abi_check.patch b/mysql-abi_check.patch
deleted file mode 100644 (file)
index 46125c7..0000000
--- a/mysql-abi_check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mysql-5.1.45/Makefile.am.orig      2010-03-31 10:52:25.000000000 -0400
-+++ mysql-5.1.45/Makefile.am   2010-03-31 10:55:05.000000000 -0400
-@@ -312,24 +312,7 @@
-       $(MAKE) abi_headers="$^" do_abi_check
- 
- do_abi_check:
--      set -ex; \
--      for file in $(abi_headers); do \
--               @CC@ -E -nostdinc -dI \
--                        -I$(top_srcdir)/include \
--                        -I$(top_srcdir)/include/mysql \
--                        -I$(top_srcdir)/sql \
--                        -I$(top_builddir)/include \
--                        -I$(top_builddir)/include/mysql \
--                        -I$(top_builddir)/sql \
--                                       $$file 2>/dev/null | \
--                        @SED@ -e '/^# /d' \
--                                  -e '/^[     ]*$$/d' \
--                                  -e '/^#pragma GCC set_debug_pwd/d' \
--                                  -e '/^#ident/d' > \
--                                             $(top_builddir)/abi_check.out; \
--                        @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
--                        @RM@ $(top_builddir)/abi_check.out; \
--      done
-+      echo "Skipping do_abi_check"
- 
- # Don't update the files from bitkeeper
- %::SCCS/s.%

diff --git a/mysql-errorlog-no-rename.patch b/mysql-errorlog-no-rename.patch
index 2b61b8ac4cb188a4eb22f8ad6437da176bb79701..937ceec7941af091b8dfcc7a98a2e1da3e2b7c70 100644 (file)
--- a/mysql-errorlog-no-rename.patch
+++ b/mysql-errorlog-no-rename.patch
@@ -14,11 +14,12 @@
      char err_temp[FN_REFLEN+5];
      /*
       On Windows is necessary a temporary file for to rename
-@@ -5060,7 +5082,6 @@
+@@ -5120,7 +5120,6 @@
      else
       result= 1;
  #else
 -   my_rename(log_error_file,err_renamed,MYF(0));
-    if (freopen(log_error_file,"a+",stdout))
-    {
-      FILE *reopen;
+    if (redirect_std_streams(log_error_file))
+      result= 1;
+ #endif
+

diff --git a/mysql-microslow.patch b/mysql-microslow.patch
index b77abdf8bd08f677992e2424b788538f2d7ecf4f..c02227d173cfd733252df862a4d5bdce0583f990 100644 (file)
--- a/mysql-microslow.patch
+++ b/mysql-microslow.patch
@@ -558,9 +558,9 @@ diff -r 0b1f42e1aacf sql/sql_cache.cc
    thd->limit_found_rows = query->found_rows();
    thd->status_var.last_query_cost= 0.0;
 +  thd->query_plan_flags|= QPLAN_QC;
-   thd->main_da.disable_status();
+   if (!thd->main_da.is_set())
+     thd->main_da.disable_status();
  
-   BLOCK_UNLOCK_RD(query_block);
 @@ -1473,6 +1474,7 @@
  err_unlock:
    STRUCT_UNLOCK(&structure_guard_mutex);

diff --git a/mysql.spec b/mysql.spec
index 11f35a53c22ddd5f825e29b321dc466a3bc27e96..584f898d675eff931a2c21784b302fca252032ae 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -31,13 +31,13 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.1.49
-Release:       2
+Version:       5.1.50
+Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 #Source0Download: http://dev.mysql.com/downloads/mysql/5.1.html#source
 Source0:       http://mysql.easynet.be/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz
-# Source0-md5: a90d87a71fa3c23dff6d78afc8e3184c
+# Source0-md5: 23bac4a0aafd683b077dac146ce2701f
 Source100:     http://www.sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz
 # Source100-md5:       7b9b618cb9b378f949bb1b91ddcc4f54
 Source1:       %{name}.init
@@ -70,7 +70,6 @@ Patch13:      %{name}-errorlog-no-rename.patch
 Patch14:       %{name}-bug-43594.patch
 Patch15:       plugin-avoid-version.patch
 Patch16:       %{name}-fix-dummy-thread-race-condition.patch
-Patch17:       %{name}-abi_check.patch
 Patch18:       %{name}-sphinx.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
 Patch100:      %{name}-userstats.patch
@@ -519,7 +518,6 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 # <percona %patches>
 %patch100 -p1
 %patch101 -p1

diff --git a/plugin-avoid-version.patch b/plugin-avoid-version.patch
index bc2ff49339ad93683615b5f41aa73d817a535792..9d72205354cf2fe6a5433baaa0e122cbba0be021 100644 (file)
--- a/plugin-avoid-version.patch
+++ b/plugin-avoid-version.patch
@@ -1,99 +1,126 @@
---- mysql-5.1.38/plugin/daemon_example/Makefile.am~    2009-08-21 15:11:25.000000000 +0300
-+++ mysql-5.1.38/plugin/daemon_example/Makefile.am     2009-09-04 14:01:26.664529401 +0300
+diff -ur mysql-5.1.50.org/plugin/daemon_example/Makefile.am mysql-5.1.50/plugin/daemon_example/Makefile.am
+--- mysql-5.1.50.org/plugin/daemon_example/Makefile.am 2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/plugin/daemon_example/Makefile.am     2010-09-23 20:52:58.514057048 +0200
 @@ -26,7 +26,7 @@
  
  EXTRA_LTLIBRARIES =   libdaemon_example.la
  pkgplugin_LTLIBRARIES =       @plugin_daemon_example_shared_target@
 -libdaemon_example_la_LDFLAGS =        -module -rpath $(pkgplugindir)
 +libdaemon_example_la_LDFLAGS =        -module -avoid-version -rpath $(pkgplugindir)
- libdaemon_example_la_CXXFLAGS=        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ libdaemon_example_la_CXXFLAGS=        $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  libdaemon_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  libdaemon_example_la_SOURCES =        daemon_example.cc
---- mysql-5.1.38/plugin/fulltext/Makefile.am~  2009-08-21 15:11:25.000000000 +0300
-+++ mysql-5.1.38/plugin/fulltext/Makefile.am   2009-09-04 14:01:51.531167265 +0300
-@@ -20,7 +20,7 @@
- #noinst_LTLIBRARIES= mypluglib.la
- pkgplugin_LTLIBRARIES= mypluglib.la
- mypluglib_la_SOURCES= plugin_example.c
--mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
-+mypluglib_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir)
- mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN
- 
- # Don't update the files from bitkeeper
---- mysql-5.1.38/storage/innodb_plugin/Makefile.am~    2009-08-21 15:12:38.000000000 +0300
-+++ mysql-5.1.38/storage/innodb_plugin/Makefile.am     2009-09-04 14:02:57.621203151 +0300
-@@ -330,7 +330,7 @@
- EXTRA_LTLIBRARIES=    ha_innodb_plugin.la
- pkgplugin_LTLIBRARIES=        @plugin_innodb_plugin_shared_target@
- 
--ha_innodb_plugin_la_LDFLAGS=  -module -rpath $(pkgplugindir)
-+ha_innodb_plugin_la_LDFLAGS=  -module -avoid-version -rpath $(pkgplugindir)
- ha_innodb_plugin_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
- ha_innodb_plugin_la_CFLAGS=   $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
- ha_innodb_plugin_la_SOURCES=  $(libinnobase_a_SOURCES)
---- mysql-5.1.45/storage/innobase/Makefile.am~ 2010-03-01 21:33:44.000000000 +0200
-+++ mysql-5.1.45/storage/innobase/Makefile.am  2010-07-25 21:30:59.790929362 +0300
-@@ -162,7 +162,7 @@
- EXTRA_LTLIBRARIES=    ha_innodb.la
- pkgplugin_LTLIBRARIES=        @plugin_innobase_shared_target@
- 
--ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir)
-+ha_innodb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir)
- ha_innodb_la_CXXFLAGS=        $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
- ha_innodb_la_CFLAGS=  $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
- ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES)
---- mysql-5.1.38/storage/example/Makefile.am~  2009-08-21 15:12:32.000000000 +0300
-+++ mysql-5.1.38/storage/example/Makefile.am   2009-09-04 14:04:54.641149541 +0300
-@@ -34,7 +34,7 @@
- 
- EXTRA_LTLIBRARIES =   ha_example.la
- pkgplugin_LTLIBRARIES =       @plugin_example_shared_target@
--ha_example_la_LDFLAGS =       -module -rpath $(pkgplugindir)
-+ha_example_la_LDFLAGS =       -module -avoid-version -rpath $(pkgplugindir)
- ha_example_la_CXXFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_example_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
- ha_example_la_SOURCES =       ha_example.cc
---- mysql-5.1.38/storage/archive/Makefile.am~  2009-08-21 15:12:32.000000000 +0300
-+++ mysql-5.1.38/storage/archive/Makefile.am   2009-09-04 14:05:53.391143885 +0300
+diff -ur mysql-5.1.50.org/storage/archive/Makefile.am mysql-5.1.50/storage/archive/Makefile.am
+--- mysql-5.1.50.org/storage/archive/Makefile.am       2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/archive/Makefile.am   2010-09-23 20:53:04.487687594 +0200
 @@ -35,7 +35,7 @@
  
  EXTRA_LTLIBRARIES =   ha_archive.la
  pkgplugin_LTLIBRARIES =       @plugin_archive_shared_target@
 -ha_archive_la_LDFLAGS =       -module -rpath $(pkgplugindir)
 +ha_archive_la_LDFLAGS =       -module -avoid-version -rpath $(pkgplugindir)
- ha_archive_la_CXXFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_archive_la_CXXFLAGS=       $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_archive_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_archive_la_SOURCES =       ha_archive.cc azio.c
---- mysql-5.1.38/storage/blackhole/Makefile.am~        2009-08-21 15:12:32.000000000 +0300
-+++ mysql-5.1.38/storage/blackhole/Makefile.am 2009-09-04 14:06:08.374683695 +0300
+diff -ur mysql-5.1.50.org/storage/blackhole/Makefile.am mysql-5.1.50/storage/blackhole/Makefile.am
+--- mysql-5.1.50.org/storage/blackhole/Makefile.am     2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/blackhole/Makefile.am 2010-09-23 20:53:04.487687594 +0200
 @@ -34,7 +34,7 @@
  
  EXTRA_LTLIBRARIES =   ha_blackhole.la
  pkgplugin_LTLIBRARIES =       @plugin_blackhole_shared_target@
 -ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
 +ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir)
- ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_blackhole_la_CFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_blackhole_la_SOURCES=ha_blackhole.cc
---- mysql-5.1.38/storage/federated/Makefile.am~        2009-08-21 15:12:33.000000000 +0300
-+++ mysql-5.1.38/storage/federated/Makefile.am 2009-09-04 14:06:24.741287557 +0300
+diff -ur mysql-5.1.50.org/storage/csv/Makefile.am mysql-5.1.50/storage/csv/Makefile.am
+--- mysql-5.1.50.org/storage/csv/Makefile.am   2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/csv/Makefile.am       2010-09-23 20:53:04.487687596 +0200
+@@ -31,7 +31,7 @@
+ 
+ EXTRA_LTLIBRARIES =   ha_csv.la
+ pkglib_LTLIBRARIES =  @plugin_csv_shared_target@
+-ha_csv_la_LDFLAGS =   -module -rpath $(MYSQLLIBdir)
++ha_csv_la_LDFLAGS =   -module -avoid-version -rpath $(MYSQLLIBdir)
+ ha_csv_la_CXXFLAGS =  $(AM_CXXFLAGS) -DMYSQL_PLUGIN
+ ha_csv_la_SOURCES =   transparent_file.cc ha_tina.cc 
+ 
+diff -ur mysql-5.1.50.org/storage/example/Makefile.am mysql-5.1.50/storage/example/Makefile.am
+--- mysql-5.1.50.org/storage/example/Makefile.am       2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/example/Makefile.am   2010-09-23 20:53:04.487687596 +0200
+@@ -34,7 +34,7 @@
+ 
+ EXTRA_LTLIBRARIES =   ha_example.la
+ pkgplugin_LTLIBRARIES =       @plugin_example_shared_target@
+-ha_example_la_LDFLAGS =       -module -rpath $(pkgplugindir)
++ha_example_la_LDFLAGS =       -module -avoid-version -rpath $(pkgplugindir)
+ ha_example_la_CXXFLAGS=       $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_example_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_example_la_SOURCES =       ha_example.cc
+diff -ur mysql-5.1.50.org/storage/federated/Makefile.am mysql-5.1.50/storage/federated/Makefile.am
+--- mysql-5.1.50.org/storage/federated/Makefile.am     2010-08-03 19:24:29.000000000 +0200
++++ mysql-5.1.50/storage/federated/Makefile.am 2010-09-23 20:53:04.487687596 +0200
 @@ -34,7 +34,7 @@
  
  EXTRA_LTLIBRARIES =   ha_federated.la
  pkgplugin_LTLIBRARIES =       @plugin_federated_shared_target@
 -ha_federated_la_LDFLAGS =     -module -rpath $(pkgplugindir)
 +ha_federated_la_LDFLAGS =     -module -avoid-version -rpath $(pkgplugindir)
- ha_federated_la_CXXFLAGS=     $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_federated_la_CXXFLAGS=     $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_federated_la_CFLAGS =      $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_federated_la_SOURCES =     ha_federated.cc
---- mysql-5.1.38/storage/ibmdb2i/Makefile.am~  2009-08-21 15:12:33.000000000 +0300
-+++ mysql-5.1.38/storage/ibmdb2i/Makefile.am   2009-09-04 14:07:07.067803277 +0300
+diff -ur mysql-5.1.50.org/storage/ibmdb2i/Makefile.am mysql-5.1.50/storage/ibmdb2i/Makefile.am
+--- mysql-5.1.50.org/storage/ibmdb2i/Makefile.am       2010-08-03 19:24:22.000000000 +0200
++++ mysql-5.1.50/storage/ibmdb2i/Makefile.am   2010-09-23 20:53:04.491021090 +0200
 @@ -33,7 +33,7 @@
  EXTRA_LTLIBRARIES =   ha_ibmdb2i.la
  pkgplugin_LTLIBRARIES =       @plugin_ibmdb2i_shared_target@
  ha_ibmdb2i_la_LIBADD =  -liconv
 -ha_ibmdb2i_la_LDFLAGS =       -module -rpath $(MYSQLLIBdir)
 +ha_ibmdb2i_la_LDFLAGS =       -module -avoid-version -rpath $(MYSQLLIBdir)
- ha_ibmdb2i_la_CXXFLAGS=       $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_ibmdb2i_la_CXXFLAGS=       $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_ibmdb2i_la_CFLAGS =        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
  ha_ibmdb2i_la_SOURCES =       ha_ibmdb2i.cc db2i_ileBridge.cc db2i_conversion.cc \
+diff -ur mysql-5.1.50.org/storage/innobase/Makefile.am mysql-5.1.50/storage/innobase/Makefile.am
+--- mysql-5.1.50.org/storage/innobase/Makefile.am      2010-08-03 19:24:20.000000000 +0200
++++ mysql-5.1.50/storage/innobase/Makefile.am  2010-09-23 20:53:04.494354584 +0200
+@@ -162,7 +162,7 @@
+ EXTRA_LTLIBRARIES=    ha_innodb.la
+ pkgplugin_LTLIBRARIES=        @plugin_innobase_shared_target@
+ 
+-ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir)
++ha_innodb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir)
+ ha_innodb_la_CXXFLAGS=        $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_la_CFLAGS=  $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES)
+diff -ur mysql-5.1.50.org/storage/innodb_plugin/Makefile.am mysql-5.1.50/storage/innodb_plugin/Makefile.am
+--- mysql-5.1.50.org/storage/innodb_plugin/Makefile.am 2010-08-03 19:24:19.000000000 +0200
++++ mysql-5.1.50/storage/innodb_plugin/Makefile.am     2010-09-23 20:53:04.494354584 +0200
+@@ -331,7 +331,7 @@
+ EXTRA_LTLIBRARIES=    ha_innodb_plugin.la
+ pkgplugin_LTLIBRARIES=        @plugin_innodb_plugin_shared_target@
+ 
+-ha_innodb_plugin_la_LDFLAGS=  -module -rpath $(pkgplugindir)
++ha_innodb_plugin_la_LDFLAGS=  -module -avoid-version -rpath $(pkgplugindir)
+ ha_innodb_plugin_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_CFLAGS=   $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_SOURCES=  $(libinnobase_a_SOURCES)
+diff -ur mysql-5.1.50.org/storage/sphinx/Makefile.am mysql-5.1.50/storage/sphinx/Makefile.am
+--- mysql-5.1.50.org/storage/sphinx/Makefile.am        2010-09-23 20:51:48.660581537 +0200
++++ mysql-5.1.50/storage/sphinx/Makefile.am    2010-09-23 20:53:05.261059401 +0200
+@@ -38,12 +38,12 @@
+ EXTRA_LTLIBRARIES =   ha_sphinx.la
+ pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la
+ 
+-ha_sphinx_la_LDFLAGS =        -module -avoid-version -rpath $(MYSQLLIBdir)
++ha_sphinx_la_LDFLAGS =        -module -avoid-version -avoid-version -rpath $(MYSQLLIBdir)
+ ha_sphinx_la_CXXFLAGS=        $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_sphinx_la_SOURCES =        ha_sphinx.cc
+ 
+-sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir)
++sphinx_la_LDFLAGS = -module -avoid-version -avoid-version -rpath $(MYSQLLIBdir)
+ sphinx_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ sphinx_la_SOURCES = snippets_udf.cc