pool/mariadb
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=34

Browse Source
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2011-01-11 10:45:52 +00:00 committed by Git OBS Bridge
parent 3a8ce11ba3
commit 40e8b4dbd9
17 changed files with 326 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
abi_test.patch Normal file
View File

@ -0,0 +1,35 @@
diff -Naru mysql-5.1.44-bak/include/mysql.h mysql-5.1.44/include/mysql.h
--- mysql-5.1.44-bak/include/mysql.h 2010-02-23 00:31:19.000000000 +0100
+++ mysql-5.1.44/include/mysql.h 2010-02-23 10:51:49.000000000 +0100
@@ -44,7 +44,9 @@
#endif
#ifndef _global_h /* If not standard header */
-#include <sys/types.h>
+#ifndef _abi_test_
+#include <sys/types.h>
+#endif
#ifdef __LCC__
#include <winsock2.h> /* For windows */
#endif
diff -Naru mysql-5.1.44-bak/include/mysql.h.pp mysql-5.1.44/include/mysql.h.pp
--- mysql-5.1.44-bak/include/mysql.h.pp 2010-02-23 00:31:19.000000000 +0100
+++ mysql-5.1.44/include/mysql.h.pp 2010-02-23 10:54:46.000000000 +0100
@@ -1,4 +1,3 @@
-#include <sys/types.h>
typedef char my_bool;
typedef int my_socket;
#include "mysql_version.h"
diff -Naru mysql-5.1.44-bak/Makefile.am mysql-5.1.44/Makefile.am
--- mysql-5.1.44-bak/Makefile.am 2010-02-23 00:31:18.000000000 +0100
+++ mysql-5.1.44/Makefile.am 2010-02-23 10:50:18.000000000 +0100
@@ -321,7 +321,8 @@
-I$(top_builddir)/include \
-I$(top_builddir)/include/mysql \
-I$(top_builddir)/sql \
- $$file 2>/dev/null | \
+ -D_abi_test_ \
+ $$file | \
@SED@ -e '/^# /d' \
-e '/^[ ]*$$/d' \
-e '/^#pragma GCC set_debug_pwd/d' \

4
default_plugins.cnf Normal file
View File

@ -0,0 +1,4 @@
[server]
plugin-load=blackhole=ha_blackhole.so
plugin-load=federated=ha_federated.so
plugin-load=archive=ha_archive.so

14
libmysql-no-pkglibdir.patch
View File

@ -3,8 +3,6 @@
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)
@ -16,16 +14,14 @@ Index: libmysql/Makefile.shared
noinst_PROGRAMS = conf_to_src
Index: libmysqld/Makefile.am
===================================================================
--- libmysqld/Makefile.am.orig
+++ libmysqld/Makefile.am
@@ -37,7 +37,7 @@ INCLUDES= -I$(top_builddir)/include -I$
@condition_dependent_plugin_includes@ \
@ndbcluster_includes@
@@ -36,7 +36,7 @@ INCLUDES= -I$(top_builddir)/include -I$
@condition_dependent_plugin_includes@
-pkglib_LTLIBRARIES = libmysqld.la
+lib_LTLIBRARIES = libmysqld.la
noinst_LIBRARIES = libmysqld_int.a
-pkglib_LIBRARIES = libmysqld.a
+lib_LIBRARIES = libmysqld.a
SUBDIRS = . examples
libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \

3
mariadb-5.1.44b.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2af7c99965a90f8f32b11516391ee46a80d0cb30221797e9190ff563f95c0cfa
size 16752425

3
mariadb-5.1.51.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60f6bd70d57c2ce7434bdd5e1717e676c97d13c843dc6db76702a5b327b4d7ce
size 18646072

3
mariadb-5.2.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01cbad3d71500a828069ec64433e34ce43d6dfff5485eb103aa98d4b230bfb03
size 18894687

46
mariadb.changes
View File

@ -1,49 +1,3 @@
-------------------------------------------------------------------
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
- updated to MariaDB 5.1.50
- based on MySQL 5.1.50 maintenance update
- changelog:
http://kb.askmonty.org/v/mariadb-5150-changelog
- release notes:
http://kb.askmonty.org/v/mariadb-5150-release-notes
- fixed init script to work on SELinux machines (bnc#635645)
-------------------------------------------------------------------
Thu Aug 12 11:54:38 CEST 2010 - mhrusecky@suse.cz
- updated to MariaDB 5.1.49
- based on MySQL 5.1.49 maintenance update
- changelog:
http://kb.askmonty.org/v/mariadb-5149-changelog
- release notes:
http://kb.askmonty.org/v/mariadb-5149-release-notes
-------------------------------------------------------------------
Wed Jun 2 10:38:05 CEST 2010 - mhrusecky@suse.cz
- updated to MariaDB 5.1.47
- based on MySQL 5.1.47 maintenance update
- changelog:
http://askmonty.org/wiki/Manual:MariaDB_5.1.47_Changelog
- release notes:
http://askmonty.org/wiki/Manual:MariaDB_5.1.47_Release_Notes
-------------------------------------------------------------------
Wed May 26 14:02:25 CEST 2010 - mhrusecky@suse.cz
- Fixed build for Fedora12
-------------------------------------------------------------------
Tue May 25 14:44:15 CEST 2010 - mhrusecky@suse.cz

31
mariadb.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package mariadb (Version 5.1.51)
# spec file for package mariadb (Version 5.1.44)
#
# 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.51
%define srv_vers 5.1.44
%if %{?rel:0}%{!?rel:1}
%define rel 1
@ -31,13 +31,13 @@
Name: mariadb
Summary: A True Multiuser, Multithreaded SQL Database Server
Version: 5.1.51
Release: 0
Version: 5.1.44
Release: 2
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
Group: Productivity/Databases/Servers
Url: http://www.mysql.com
# http://askmonty.org/downloads/r/http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.47/kvm-tarbake-jaunty-x86/%{name}-%{version}.tar.gz
Source: mariadb-%{version}.tar.bz2
# http://dev.mysql.com/get/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz/from/pick
Source: mariadb-%{version}b.tar.bz2
Source2: baselibs.conf
Source3: README.debug
Source4: suse-test-run
@ -69,12 +69,12 @@ Patch25: mysql-5.1.31-shebang.patch
# http://bugs.mysql.com/bug.php?id=38811
Patch27: mysql-5.1.35-test-variables-big.patch
# PATCH-FIX-SUSE mysql-5.1.32-myslq-test.patch mhrusecky@suse.cz -- installs tests into datadir not into prefix
Patch28: mariadb-5.1.51-myslq-test.patch
Patch28: mysql-5.1.42-myslq-test.patch
# PATCH-FIX-UPSTREAM mysql-5.1.33-scripts-paths.patch [ upstream#45616 ] mhrusecky@suse.cz -- fixes build of scripts when compilation occurs somewhere else
# http://bugs.mysql.com/bug.php?id=45616
Patch29: mysql-5.1.33-scripts-paths.patch
# PATCH-FIX-SUSE mysql-5.1.33-safe-process-in-bin.patch [] mhrusecky@suse.cz -- this will let us move one binary to /usr/bin instead of /usr/share/mysql-test/...
Patch30: mysql-5.1.45-safe-process-in-bin.patch
Patch30: mysql-5.1.33-safe-process-in-bin.patch
# PATCH-FIX-SUSE mysql-5.1.33-ssl-lib64-macro.patch [] mhrusecky@suse.cz -- search for ssl libraries also in lib64
Patch31: mysql-5.1.33-ssl-lib64-macro.patch
# PATCH-FIX-SUSE mysql-5.1.35-test-utf8.patch [] mhrusecky@suse.cz -- we use utf-8 by default which produces different output with few tests
@ -87,6 +87,7 @@ Patch37: mysql-5.1.36-bmove512.patch
Patch38: mysql-5.1.36-hotcopy.patch
# PATCH-FIX-UPSTREAM mysql_config.patch [ upstream#39175, bnc#420313 ] mhrusecky@suse.cz -- Fix linking options.
Patch39: mysql_config.patch
Patch45: abi_test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
PreReq: pwdutils
@ -104,9 +105,6 @@ BuildRequires: pwdutils tcpd-devel
%if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8
BuildRequires: fdupes
%endif
%if 0%{?fedora_version} > 11
BuildRequires: sqlite
%endif
%if 0%{?suse_version} > 1030
Recommends: logrotate
%else
@ -415,7 +413,7 @@ advanced user. They should be used with caution.
%prep
#-------------------------------------------------------------------------------
%setup -q -n mariadb-%{version}
%setup -q -n mariadb-%{version}b
cp %_sourcedir/README.SuSE .
cp %_sourcedir/suse-test-run .
%patch2
@ -438,6 +436,7 @@ cp %_sourcedir/suse-test-run .
%patch37
%patch38
%patch39
%patch45 -p1
# remove unneeded manpages ('make install' basically installs everything under
# man/*)
rm -f man/mysqlman.1 # dummy fallback manpage
@ -503,7 +502,7 @@ BuildMySQL() {
--with-atomic-ops=smp \
%endif
--with-ssl=/usr \
--with-plugins=partition,csv,heap,myisam,ndbcluster \
--with-plugins=partition,csv,heap,myisam,ndbcluster,innobase \
HOSTNAME="/bin/hostname -f" \
"$@"
# Add this for MyISAM RAID support:
@ -613,6 +612,8 @@ install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf
install -m 644 "${DOCS[@]}" ${DOCDIR}
install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql
ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql
# this is used by the init script
install -m 755 -d %buildroot/var/run/mysql
# SuSEfirewall service description
install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \
%buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql
@ -655,8 +656,7 @@ rm -rf '%buildroot'/%_libdir/libmysqlclient*
rm -rf '%buildroot'/%_libdir/libmariadbclient.{a,la,so}
rm -rf '%buildroot'/%_libdir/libmariadbclient_r*.{a,la,so}
rm -rf '%buildroot'/%_includedir
rm -rf '%buildroot'/%_datadir/man/*/mysql_config*
rm -rf '%buildroot'/%_bindir/mysql_config
rm -rf '%buildroot'/%_datadir/man/*/mysql_config*
rm -rf '%buildroot'/%_datadir/aclocal
%endif
sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql
@ -815,6 +815,7 @@ fi
/etc/init.d/mysql
/usr/sbin/rcmysql
/usr/share/mysql/
%dir %attr(755,mysql,mysql)/var/run/mysql
%dir %{_libdir}/mysql
%{_libdir}/mysql/mysqld.sym
%config /etc/sysconfig/SuSEfirewall2.d/services/mysql

20
mysql-5.1.33-safe-process-in-bin.patch Normal file
View File

@ -0,0 +1,20 @@
--- mysql-test/lib/My/SafeProcess.pm 2009-04-03 15:14:38.000000000 +0200
+++ mysql-test/lib/My/SafeProcess.pm 2009-03-13 22:49:26.000000000 +0100
@@ -86,7 +86,7 @@
my $safe_kill;
if (IS_WIN32PERL or IS_CYGWIN){
# Use my_safe_process.exe
+ my $exe= my_find_bin(".", ["../../bin","lib/My/SafeProcess", "My/SafeProcess"],
- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
"my_safe_process");
push(@safe_process_cmd, $exe);
@@ -96,7 +96,7 @@
else
{
# Use my_safe_process
+ my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"],
- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
"my_safe_process");
push(@safe_process_cmd, $exe);
}

12
mariadb-5.1.51-myslq-test.patch → mysql-5.1.42-myslq-test.patch
View File

@ -24,3 +24,15 @@ 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]);

22
mysql-5.1.45-safe-process-in-bin.patch
View File

@ -1,22 +0,0 @@
Index: mysql-test/lib/My/SafeProcess.pm
===================================================================
--- mysql-test/lib/My/SafeProcess.pm.orig
+++ mysql-test/lib/My/SafeProcess.pm
@@ -89,7 +89,7 @@ sub find_bin {
if (IS_WIN32PERL or IS_CYGWIN)
{
# Use my_safe_process.exe
- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
+ my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"],
"my_safe_process");
push(@safe_process_cmd, $exe);
@@ -99,7 +99,7 @@ sub find_bin {
else
{
# Use my_safe_process
- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
+ my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"],
"my_safe_process");
push(@safe_process_cmd, $exe);
}

2
mysql-cnf.patch
View File

@ -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-external-locking
skip-locking
key_buffer_size = 16M
max_allowed_packet = 1M
@@ -129,7 +131,13 @@ server-id = 1

3
mysql-patches.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb020b16e762537998e75b90fce9725cb8935c4d7a5701fb65208d8ef40b8853
size 14019

88
mysql-plugins-avoid-version.patch
View File

@ -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 = libarchive.la ha_archive.la
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= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_archive_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_archive_la_CFLAGS = $(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 = libblackhole.la ha_blackhole.la
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=-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -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 = libcsv.la ha_csv.la
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 = -shared $(AM_CXXFLAGS) -DMYSQL_PLUGIN
ha_csv_la_CXXFLAGS = $(AM_CFLAGS) -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 = libexample.la ha_example.la
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= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
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
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 = libfederatedx.la libfederatedx_common.la libfederatedx_embedded.la ha_federatedx.la
pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@
EXTRA_LTLIBRARIES = ha_federatedx.la
pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@
-ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir)
+ha_federatedx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir)
ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_federatedx_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_federatedx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
Index: storage/ibmdb2i/Makefile.am
===================================================================
@ -73,58 +73,32 @@ Index: storage/ibmdb2i/Makefile.am
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_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_ibmdb2i_la_CXXFLAGS= $(AM_CFLAGS) -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 \
Index: storage/pbxt/src/Makefile.am
===================================================================
--- storage/pbxt/src/Makefile.am.orig
+++ storage/pbxt/src/Makefile.am
@@ -42,7 +42,7 @@ libpbxt_la_SOURCES = $(non_mysql_interna
@@ -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
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
-libpbxt_la_LDFLAGS = -module
+libpbxt_la_LDFLAGS = -module -avoid-version
# 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
@@ -331,7 +331,7 @@ libxtradb_la_CFLAGS= $(AM_CFLAGS)
EXTRA_LTLIBRARIES= libxtradb.la ha_xtradb.la
pkgplugin_LTLIBRARIES= @plugin_xtradb_shared_target@
@@ -331,7 +331,7 @@ libinnobase_a_CFLAGS= $(AM_CFLAGS)
EXTRA_LTLIBRARIES= ha_innodb.la
pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@
-ha_xtradb_la_LDFLAGS= -module -rpath $(pkgplugindir)
+ha_xtradb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir)
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 = 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= -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
@@ -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= -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)
-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)

10
mysql_upgrade-exit-status.patch
View File

@ -5,11 +5,9 @@ mysql_upgrade (eg. our init script)
mysql-test/t/mysql_upgrade.test | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
Index: client/mysql_upgrade.c
===================================================================
--- client/mysql_upgrade.c.orig
+++ client/mysql_upgrade.c
@@ -878,7 +878,9 @@ int main(int argc, char **argv)
@@ -758,7 +758,9 @@ int main(int argc, char **argv)
printf("This installation of MySQL is already upgraded to %s, "
"use --force if you still need to run mysql_upgrade\n",
MYSQL_SERVER_VERSION);
@ -20,16 +18,14 @@ Index: client/mysql_upgrade.c
}
/*
Index: mysql-test/t/mysql_upgrade.test
===================================================================
--- mysql-test/t/mysql_upgrade.test.orig
+++ mysql-test/t/mysql_upgrade.test
@@ -41,7 +41,7 @@ file_exists $MYSQLD_DATADIR/mysql_upgrad
@@ -19,7 +19,7 @@ file_exists $MYSQLTEST_VARDIR/master-dat
--echo Run it again - should say already completed
--replace_result $MYSQL_SERVER_VERSION VERSION
---error 1
+--error 0
--exec $MYSQL_UPGRADE 2>&1
--exec $MYSQL_UPGRADE --skip-verbose 2>&1
# It should have created a file in the MySQL Servers datadir

186
project.diff Normal file
View File

@ -0,0 +1,186 @@
--- install.inc.orig
+++ install.inc
@@ -119,4 +119,5 @@ sed -i 's|doc/packages/mysql|doc/package
ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair
ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze
ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize
-
+mkdir -p '%buildroot'/etc/mysql
+[ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql
--- mariadb.changes.orig
+++ mariadb.changes
@@ -1,13 +1,20 @@
-------------------------------------------------------------------
-Tue Dec 7 12:03:18 CET 2010 - mhrusecky@suse.cz
+Tue Dec 7 11:27:24 CET 2010 - mhrusecky@suse.cz
-- updated to MariaDB 5.1.53
- - based on MySQL 5.1.53 maintenance update
- - changelog:
- http://kb.askmonty.org/v/mariadb-5153-changelog
- - release notes:
- http://kb.askmonty.org/v/mariadb-5153-release-notes
-
+- updated to MariaDB 5.2.4
+ * Release notes:
+ http://kb.askmonty.org/v/mariadb-524-release-notes
+ * Changelog:
+ http://kb.askmonty.org/v/mariadb-524-changelog
+
+-------------------------------------------------------------------
+Wed Nov 10 11:58:13 CET 2010 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.2.3
+ * Release notes:
+ http://kb.askmonty.org/v/mariadb-523-release-notes
+ * Changelog:
+ http://kb.askmonty.org/v/mariadb-523-changelog
-------------------------------------------------------------------
Thu Oct 21 11:07:15 CEST 2010 - mhrusecky@suse.cz
--- mariadb.spec.orig
+++ mariadb.spec
@@ -1,5 +1,5 @@
#
-# spec file for package mariadb (Version 5.1.44)
+# spec file for package mariadb (Version 5.2.3)
#
# 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 builtin_plugins partition,csv,heap,maria,pbxt,myisam,myisammrg,xtradb
+%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
%if %{?rel:0}%{!?rel:1}
%define rel 1
@@ -29,9 +29,9 @@
#Packager: %packager
#Vendor: %vendor
-Name: mariadb
+Name: mariadb52
Summary: A True Multiuser, Multithreaded SQL Database Server
-Version: 5.1.53
+Version: 5.2.4
%define srv_vers 5.1.53
Release: 0
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
@@ -90,13 +90,13 @@ This package only contains the server-si
%if ! 0%{?prefered} > 0
#-------------------------------------------------------------------------------
-%package -n libmariadbclient16
+%package -n libmariadb52client16
#-------------------------------------------------------------------------------
Summary: MariaDB Shared Libraries
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
Group: Development/Libraries/Other
-%description -n libmariadbclient16
+%description -n libmariadb52client16
This package contains the shared libraries (.so) which certain
languages and applications need to dynamically load and use MariaDB.
@@ -106,13 +106,13 @@ Authors:
David Axmark <davida@mysql.com>
#-------------------------------------------------------------------------------
-%package -n libmariadbclient_r16
+%package -n libmariadb52client_r16
#-------------------------------------------------------------------------------
Summary: MariaDB Shared Libraries
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
Group: Development/Libraries/Other
-%description -n libmariadbclient_r16
+%description -n libmariadb52client_r16
This package contains the shared libraries (.so) which certain
languages and applications need to dynamically load and use MariaDB.
@@ -408,7 +408,7 @@ rm -f sql/sql_builtin.cc
sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
%if ! 0%{?prefered} > 0
for i in `grep -Rl mysqlclient .`; do
- sed -i 's|mysqlclient|mariadbclient|g' $i
+ sed -i 's|mysqlclient|mariadb52client|g' $i
done
%endif
@@ -471,25 +471,25 @@ fi
%if ! 0%{prefered} > 0
#-------------------------------------------------------------------------------
-%post -n libmariadbclient16
+%post -n libmariadb52client16
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
-%postun -n libmariadbclient16
+%postun -n libmariadb52client16
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
-%post -n libmariadbclient_r16
+%post -n libmariadb52client_r16
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
-%postun -n libmariadbclient_r16
+%postun -n libmariadb52client_r16
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
@@ -554,6 +554,8 @@ fi
#-------------------------------------------------------------------------------
%defattr(-, root, root)
%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf
+%dir %attr(0750, root, mysql) /etc/mysql
+%config(noreplace) %attr(0640, root, mysql) /etc/mysql/*
%config /etc/logrotate.d/mysql
%doc %{_defaultdocdir}/%{name}
%doc %{_infodir}/mysql.info.*
@@ -576,17 +578,17 @@ fi
%if ! 0%{prefered} > 0
#-------------------------------------------------------------------------------
-%files -n libmariadbclient16
+%files -n libmariadb52client16
#-------------------------------------------------------------------------------
%defattr(-, root, root)
-%{_libdir}/libmariadbclient.so.*
+%{_libdir}/libmariadb52client.so.*
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
-%files -n libmariadbclient_r16
+%files -n libmariadb52client_r16
#-------------------------------------------------------------------------------
%defattr(-, root, root)
-%{_libdir}/libmariadbclient_r.so.*
+%{_libdir}/libmariadb52client_r.so.*
#-------------------------------------------------------------------------------
%endif
--- series.orig
+++ series
@@ -12,9 +12,9 @@ mariadb-5.1.50-install_db-quiet.patch
mysql-community-server-5.1.51-myslq-test.patch
mysql-community-server-5.1.51-mysql_config.patch
mysql-community-server-5.1.51-mysqld_multi-features.patch
+mariadb-5.2.4-plugins-avoid-version.patch
mariadb-5.1.50-upgrade-exit-status.patch
mariadb-5.2.3-cnf.patch
mariadb-5.2.4-libmysql-no-pkglibdir.patch
-mariadb-5.1.53-plugins-avoid-version.patch
mysql-community-server-5.1.53-ssl-compilation-fix.patch
-mariadb-5.1.53-compilation-fix.patch
+mariadb-5.2.4-compilation-fix.patch

10
rc.mysql-multi
View File

@ -251,8 +251,6 @@ else
datadir=/var/lib/mysql
mysql_daemon_user=mysql
mysql_daemon_group=mysql
mkdir -m 755 -p /var/run/mysql
chown $mysql_daemon_user:$mysql_daemon_group /var/run/mysql
pid_file=/var/run/mysql/mysqld.pid
socket=/var/run/mysql/mysql.sock
print_defaults=/usr/bin/my_print_defaults
@ -280,12 +278,12 @@ else
# prepare tmp dir
if [ "$TMPDIR" ] && [ -d "$TMPDIR" ] && \
[ "`ls -ld "$TMPDIR" | grep "^drwx------[\\.\+]\?[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then
[ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then
rm -rf "$TMPDIR"
fi
TMPDIR="`mktemp -d -p /var/tmp mysql.XXXXXX | tee /var/run/mysql/tmpdir`"
[ -z "$TMPDIR" ] || chown "$mysql_daemon_user:$mysql_daemon_group" "$TMPDIR"
[ "`ls -ld "$TMPDIR" | grep "^drwx------[\\.\+]\?[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || {
[ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || {
echo "Can't create secure $TMPDIR"
rc_failed; rc_status -v; rc_exit;
}
@ -379,7 +377,7 @@ else
fi
protected="`mktemp -d -p /var/tmp mysql-protected.XXXXXX | tee /var/run/mysql/protecteddir`"
[ -z "$protected" ] || chown "$mysql_daemon_user:$mysql_daemon_group" "$protected"
[ "`ls -ld "$protected" | grep "^drwx------[\\.\+]\?[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || {
[ "`ls -ld "$protected" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || {
echo "Can't create secure $protected" | tee -a "$log_upgrade"
rc_failed; rc_status -v; rc_exit;
}
@ -444,7 +442,7 @@ else
echo -n "Shutting down service MySQL "
kill_mysql
if [ "$TMPDIR" ] && [ -d "$TMPDIR" ] && \
[ "`ls -ld "$TMPDIR" | grep "^drwx------[\\.\+]\?[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then
[ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then
rm -rf "$TMPDIR"
fi
# Remember status and be verbose