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

- updated to MariaDB 5.1.50

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=25
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2010-09-29 10:17:50 +00:00 committed by Git OBS Bridge
parent 56dfe075ce
commit e99c0e19d4
7 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
abi_test.patch
View File

@ -1,35 +0,0 @@
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' \

3
mariadb-5.1.49.tar.bz2
View File

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

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

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

10
mariadb.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Thu Aug 12 11:54:38 CEST 2010 - mhrusecky@suse.cz

6
mariadb.spec
View File

@ -20,7 +20,7 @@
# Few definitions which will alter build
%define prefered 0
%define cluster 0
%define srv_vers 5.1.49
%define srv_vers 5.1.50
%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.49
Version: 5.1.50
Release: 0
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
Group: Productivity/Databases/Servers
@ -87,7 +87,6 @@ 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
@ -439,7 +438,6 @@ 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

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

@ -8,7 +8,7 @@ Index: storage/archive/Makefile.am
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
Index: storage/blackhole/Makefile.am
@ -21,7 +21,7 @@ Index: storage/blackhole/Makefile.am
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
Index: storage/csv/Makefile.am
@ -34,7 +34,7 @@ Index: storage/csv/Makefile.am
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_CFLAGS) -DMYSQL_PLUGIN
ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN
ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc
Index: storage/example/Makefile.am
@ -47,7 +47,7 @@ Index: storage/example/Makefile.am
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_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_example_la_SOURCES = ha_example.cc
Index: storage/federatedx/Makefile.am
@ -73,7 +73,7 @@ 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_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 \
Index: storage/pbxt/src/Makefile.am
@ -112,7 +112,7 @@ Index: storage/federated/Makefile.am
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 $(top_srcdir)/mysys/string.c
Index: storage/innodb_plugin/Makefile.am
@ -125,6 +125,6 @@ Index: storage/innodb_plugin/Makefile.am
-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_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES)

10
mysql_upgrade-exit-status.patch
View File

@ -5,9 +5,11 @@ 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
@@ -758,7 +758,9 @@ int main(int argc, char **argv)
@@ -878,7 +878,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);
@ -18,14 +20,16 @@ mysql_upgrade (eg. our init script)
}
/*
Index: mysql-test/t/mysql_upgrade.test
===================================================================
--- mysql-test/t/mysql_upgrade.test.orig
+++ mysql-test/t/mysql_upgrade.test
@@ -19,7 +19,7 @@ file_exists $MYSQLTEST_VARDIR/master-dat
@@ -41,7 +41,7 @@ file_exists $MYSQLD_DATADIR/mysql_upgrad
--echo Run it again - should say already completed
--replace_result $MYSQL_SERVER_VERSION VERSION
---error 1
+--error 0
--exec $MYSQL_UPGRADE --skip-verbose 2>&1
--exec $MYSQL_UPGRADE 2>&1
# It should have created a file in the MySQL Servers datadir