diff --git a/libmysql-no-pkglibdir.patch b/libmysql-no-pkglibdir.patch index 75f3ff4..95f913a 100644 --- a/libmysql-no-pkglibdir.patch +++ b/libmysql-no-pkglibdir.patch @@ -3,6 +3,8 @@ libmysqld/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) +Index: libmysql/Makefile.shared +=================================================================== --- libmysql/Makefile.shared.orig +++ libmysql/Makefile.shared @@ -26,7 +26,7 @@ MYSQLBASEdir= $(prefix) @@ -14,14 +16,16 @@ noinst_PROGRAMS = conf_to_src +Index: libmysqld/Makefile.am +=================================================================== --- libmysqld/Makefile.am.orig +++ libmysqld/Makefile.am -@@ -36,7 +36,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - @condition_dependent_plugin_includes@ +@@ -37,7 +37,7 @@ INCLUDES= -I$(top_builddir)/include -I$ + @condition_dependent_plugin_includes@ \ + @ndbcluster_includes@ - noinst_LIBRARIES = libmysqld_int.a --pkglib_LIBRARIES = libmysqld.a -+lib_LIBRARIES = libmysqld.a +-pkglib_LTLIBRARIES = libmysqld.la ++lib_LTLIBRARIES = libmysqld.la SUBDIRS = . examples libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ diff --git a/mariadb-5.1.50.tar.bz2 b/mariadb-5.1.50.tar.bz2 deleted file mode 100644 index 4ebb7b9..0000000 --- a/mariadb-5.1.50.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f78a4d2397cd9a6bba9d4728aa223f767f27a8c2aa7bc5862fd905c76ba5b434 -size 18620649 diff --git a/mysql-5.1.42-myslq-test.patch b/mariadb-5.1.51-myslq-test.patch similarity index 64% rename from mysql-5.1.42-myslq-test.patch rename to mariadb-5.1.51-myslq-test.patch index 70dfad2..37931ff 100644 --- a/mysql-5.1.42-myslq-test.patch +++ b/mariadb-5.1.51-myslq-test.patch @@ -24,15 +24,3 @@ Index: mysql-test/lib/My/SafeProcess/Makefile.am safedir = $(testroot)/mysql-test/lib/My/SafeProcess #nobase_bin_PROGRAMS = ... safe_PROGRAMS = my_safe_process -Index: mysql-test/lib/mtr_cases.pm -=================================================================== ---- mysql-test/lib/mtr_cases.pm.orig -+++ mysql-test/lib/mtr_cases.pm -@@ -254,6 +254,7 @@ sub collect_one_suite($) - "share/mysql/mysql-test/suite", - "share/mysql/mysql-test", - # Look in storage engine specific suite dirs -+ "share/mysql/storage/*/mysql-test-suites", - "storage/*/mysql-test-suites" - ], - [$suite]); diff --git a/mariadb-5.1.51.tar.bz2 b/mariadb-5.1.51.tar.bz2 new file mode 100644 index 0000000..a6e5353 --- /dev/null +++ b/mariadb-5.1.51.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60f6bd70d57c2ce7434bdd5e1717e676c97d13c843dc6db76702a5b327b4d7ce +size 18646072 diff --git a/mariadb.changes b/mariadb.changes index fd70205..304c3b8 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 23 15:04:33 CET 2010 - mhrusecky@suse.cz + +- updated to MariaDB 5.1.51 + - based on MySQL 5.1.51 maintenance update + - changelog: + http://kb.askmonty.org/v/mariadb-5151-changelog + - release notes: + http://kb.askmonty.org/v/mariadb-5151-release-notes + ------------------------------------------------------------------- Wed Sep 29 12:15:59 CEST 2010 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index d72f488..928770f 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1,5 +1,5 @@ # -# spec file for package mariadb (Version 5.1.44) +# spec file for package mariadb (Version 5.1.51) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ # Few definitions which will alter build %define prefered 0 %define cluster 0 -%define srv_vers 5.1.50 +%define srv_vers 5.1.51 %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -31,7 +31,7 @@ Name: mariadb Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 5.1.50 +Version: 5.1.51 Release: 0 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers diff --git a/mysql-cnf.patch b/mysql-cnf.patch index 371f85f..9ff0dad 100644 --- a/mysql-cnf.patch +++ b/mysql-cnf.patch @@ -38,7 +38,7 @@ Index: support-files/my-medium.cnf.sh socket = @MYSQL_UNIX_ADDR@ +# Change following line if you want to store your database elsewhere +datadir = /var/lib/mysql - skip-locking + skip-external-locking key_buffer_size = 16M max_allowed_packet = 1M @@ -129,7 +131,13 @@ server-id = 1 diff --git a/mysql-plugins-avoid-version.patch b/mysql-plugins-avoid-version.patch index d8a419a..0e78c7f 100644 --- a/mysql-plugins-avoid-version.patch +++ b/mysql-plugins-avoid-version.patch @@ -4,12 +4,12 @@ Index: storage/archive/Makefile.am +++ storage/archive/Makefile.am @@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r - EXTRA_LTLIBRARIES = ha_archive.la + EXTRA_LTLIBRARIES = libarchive.la 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_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_archive_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_archive_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_SOURCES = ha_archive.cc azio.c Index: storage/blackhole/Makefile.am =================================================================== @@ -17,24 +17,24 @@ Index: storage/blackhole/Makefile.am +++ storage/blackhole/Makefile.am @@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h - EXTRA_LTLIBRARIES = ha_blackhole.la + EXTRA_LTLIBRARIES = libblackhole.la 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_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_blackhole_la_CXXFLAGS=-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_SOURCES=ha_blackhole.cc + Index: storage/csv/Makefile.am =================================================================== --- storage/csv/Makefile.am.orig +++ storage/csv/Makefile.am @@ -31,7 +31,7 @@ noinst_HEADERS = ha_tina.h transparent - EXTRA_LTLIBRARIES = ha_csv.la + EXTRA_LTLIBRARIES = libcsv.la 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_CXXFLAGS = -shared $(AM_CXXFLAGS) -DMYSQL_PLUGIN ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc Index: storage/example/Makefile.am @@ -43,25 +43,25 @@ Index: storage/example/Makefile.am +++ storage/example/Makefile.am @@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h - EXTRA_LTLIBRARIES = ha_example.la + EXTRA_LTLIBRARIES = libexample.la 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_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_example_la_SOURCES = ha_example.cc + Index: storage/federatedx/Makefile.am =================================================================== --- storage/federatedx/Makefile.am.orig +++ storage/federatedx/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = ha_federatedx.h federat - EXTRA_LTLIBRARIES = ha_federatedx.la + EXTRA_LTLIBRARIES = libfederatedx.la libfederatedx_common.la libfederatedx_embedded.la ha_federatedx.la pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@ -ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_federatedx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_federatedx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_federatedx_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN Index: storage/ibmdb2i/Makefile.am =================================================================== @@ -80,51 +80,51 @@ Index: storage/pbxt/src/Makefile.am =================================================================== --- storage/pbxt/src/Makefile.am.orig +++ storage/pbxt/src/Makefile.am -@@ -35,7 +35,7 @@ libpbxt_la_SOURCES = bsearch_xt.cc cache - systab_xt.cc ha_xtsys.cc discover_xt.cc backup_xt.cc \ - util_xt.cc xaction_xt.cc xactlog_xt.cc lock_xt.cc locklist_xt.cc +@@ -42,7 +42,7 @@ libpbxt_la_SOURCES = $(non_mysql_interna --libpbxt_la_LDFLAGS = -module -+libpbxt_la_LDFLAGS = -module -avoid-version + libpbxt_la_CXXFLAGS = -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN + libpbxt_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99 +-libpbxt_la_LDFLAGS = -module ++libpbxt_la_LDFLAGS = -module -avoid-version + + noinst_LTLIBRARIES = libpbxt_s.la libpbxt_s_embedded.la libpbxt_s_common.la - # These are the warning Drizzle uses: - # DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter Index: storage/xtradb/Makefile.am =================================================================== --- storage/xtradb/Makefile.am.orig +++ storage/xtradb/Makefile.am -@@ -332,7 +332,7 @@ libxtradb_a_CFLAGS= $(AM_CFLAGS) - EXTRA_LTLIBRARIES= ha_xtradb.la +@@ -331,7 +331,7 @@ libxtradb_la_CFLAGS= $(AM_CFLAGS) + EXTRA_LTLIBRARIES= libxtradb.la ha_xtradb.la pkgplugin_LTLIBRARIES= @plugin_xtradb_shared_target@ -ha_xtradb_la_LDFLAGS= -module -rpath $(pkgplugindir) +ha_xtradb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) - ha_xtradb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_xtradb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_xtradb_la_SOURCES= $(libxtradb_a_SOURCES) + ha_xtradb_la_CXXFLAGS= -shared $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) + ha_xtradb_la_CFLAGS= -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) + ha_xtradb_la_SOURCES= $(libxtradb_la_SOURCES) Index: storage/federated/Makefile.am =================================================================== --- storage/federated/Makefile.am.orig +++ storage/federated/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = ha_federated.h - EXTRA_LTLIBRARIES = ha_federated.la + EXTRA_LTLIBRARIES = libfederated.la libfederated_embedded.la 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_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_federated_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_federated_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federated_la_SOURCES = ha_federated.cc $(top_srcdir)/mysys/string.c Index: storage/innodb_plugin/Makefile.am =================================================================== --- storage/innodb_plugin/Makefile.am.orig +++ storage/innodb_plugin/Makefile.am -@@ -331,7 +331,7 @@ libinnobase_a_CFLAGS= $(AM_CFLAGS) - EXTRA_LTLIBRARIES= ha_innodb_plugin.la +@@ -330,7 +330,7 @@ libinnobase_la_CFLAGS= $(AM_CFLAGS) + EXTRA_LTLIBRARIES= libinnobase.la 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) + ha_innodb_plugin_la_CXXFLAGS= -shared $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) + ha_innodb_plugin_la_CFLAGS= -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) + ha_innodb_plugin_la_SOURCES= $(libinnobase_la_SOURCES)