Author: arekm Date: Thu Sep 23 19:14:58 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 5.1.50
---- Files affected:
packages/mysql:
mysql-errorlog-no-rename.patch (1.4 -> 1.5) , mysql-microslow.patch (1.6 ->
1.7) , mysql.spec (1.490 -> 1.491) , plugin-avoid-version.patch (1.2 -> 1.3) ,
mysql-abi_check.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mysql/mysql-errorlog-no-rename.patch
diff -u packages/mysql/mysql-errorlog-no-rename.patch:1.4
packages/mysql/mysql-errorlog-no-rename.patch:1.5
--- packages/mysql/mysql-errorlog-no-rename.patch:1.4 Mon Feb 1 13:58:59 2010
+++ packages/mysql/mysql-errorlog-no-rename.patch Thu Sep 23 21:14:52 2010
@@ -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
+
================================================================
Index: packages/mysql/mysql-microslow.patch
diff -u packages/mysql/mysql-microslow.patch:1.6
packages/mysql/mysql-microslow.patch:1.7
--- packages/mysql/mysql-microslow.patch:1.6 Sat Jul 24 14:42:00 2010
+++ packages/mysql/mysql-microslow.patch Thu Sep 23 21:14:52 2010
@@ -558,9 +558,9 @@
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);
================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.490 packages/mysql/mysql.spec:1.491
--- packages/mysql/mysql.spec:1.490 Sat Jul 31 11:23:18 2010
+++ packages/mysql/mysql.spec Thu Sep 23 21:14:52 2010
@@ -32,13 +32,13 @@
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
@@ -71,7 +71,6 @@
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
@@ -520,7 +519,6 @@
%patch14 -p0
%patch15 -p1
%patch16 -p1
-%patch17 -p1
# <percona %patches>
%patch100 -p1
%patch101 -p1
@@ -1127,6 +1125,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.491 2010/09/23 19:14:52 arekm
+- up to 5.1.50
+
Revision 1.490 2010/07/31 09:23:18 arekm
- fix mysql_install_db
================================================================
Index: packages/mysql/plugin-avoid-version.patch
diff -u packages/mysql/plugin-avoid-version.patch:1.2
packages/mysql/plugin-avoid-version.patch:1.3
--- packages/mysql/plugin-avoid-version.patch:1.2 Sun Jul 25 20:42:11 2010
+++ packages/mysql/plugin-avoid-version.patch Thu Sep 23 21:14:52 2010
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-errorlog-no-rename.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-microslow.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.490&r2=1.491&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/plugin-avoid-version.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
