rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

test

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=36
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2011-01-11 11:12:56 +00:00 committed by Git OBS Bridge
parent 40e8b4dbd9
commit 1ec736a975
31 changed files with 1979 additions and 1593 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' \

82
build.inc Normal file
View File

@ -0,0 +1,82 @@
%if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0
%define socketpath /var/lib/mysql
%else
%define socketpath /var/run/mysql
%endif
autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing -Wno-unused-parameter"
export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"
# Make the compile a function, since we do multiple builds
BuildMySQL() {
# The --enable-assembler simply does nothing on systems that do not
# support assembler speedups.
suffix="$1"; shift
mkdir _build$suffix
pushd _build$suffix
../configure \
--enable-assembler \
--without-readline \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
--libexecdir=/usr/sbin \
--localstatedir=/var/lib/mysql \
--mandir=%{_mandir} \
--prefix=%{_prefix} \
--sysconfdir=/etc \
--with-mysqld-user=mysql \
--with-mysqld-group=mysql \
--without-debug \
--datadir=/usr/share \
--includedir=/usr/include \
--with-charset=utf8 \
--with-collation=utf8_unicode_ci \
--with-extra-charsets=all \
--with-unix-socket-path=%{socketpath}/mysql.sock \
--enable-thread-safe-client \
--with-comment="SUSE MySQL RPM" \
--with-libwrap \
--with-server-suffix=$suffix \
%ifarch s390 s390x
--with-atomic-ops=rwlocks \
%else
--with-atomic-ops=smp \
%endif
--with-ssl=/usr \
--with-plugins=%{builtin_plugins} \
HOSTNAME="/bin/hostname -f" \
"$@"
# Add this for MyISAM RAID support:
# --with-raid
# benchdir does not fit in above model. Fix when we make a separate package
make %{?jobs:-j%jobs}
nm --numeric-sort sql/mysqld > sql/mysqld.sym
# needed for make check, which is not VPATH aware
# copy the files unconditionally so that manual 'make check' after
# the build works, too
cp -a ../mysql-test/* mysql-test/
for i in ../sql/share/{english,charsets}; do
[ -d $i ] && cp -a $i sql/share/
done
cp -a ../scripts/*.sql scripts/
%if %{?_with_testsuite:1}0
pushd mysql-test; perl ./mysql-test-run.pl --force; popd
%endif
popd
}
# Build the client, extra tools, libraries
BuildMySQL "" --with-embedded-server
# build mysqld-debug
BuildMySQL "-debug" --with-debug --without-embedded-server
%if 0%{?prefered} > 0
mkdir -p _buildlibmysqld/tmp
cd _buildlibmysqld/tmp
ar -x ../../_build/libmysqld/libmysqld.a
gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \
*.o \
-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
cd ..
rm -rf tmp
cd ..
%endif

1620
changes.factory Normal file
View File

File diff suppressed because it is too large Load Diff

123
install.inc Normal file
View File

@ -0,0 +1,123 @@
# install the debug server first, so that we don't overwrite the standard
# /usr/sbin/mysqld
mkdir -p %buildroot%_libdir/mysql
make -C _build-debug/sql install DESTDIR=%buildroot
mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym
# install the client, extra tools, libraries and the standard server
make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/
install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
# remove most static libs (FIXME: don't build them at all...)
rm -f %buildroot%_libdir/libmysqlclient*a
rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la
rm -f %buildroot%_libdir/mysql/plugin/*a
# XXX: package these? The ndb tools are linked statically atm
rm -f %buildroot%_libdir/mysql/libndbclient.*
rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run
rm -f %{buildroot}/usr/share/mysql-test/mtr
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run
mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
# generate filelist for binaries and their manpages (easier than enumerating
# all the binaries and manapages manually, esp. when there are new manpages in
# each release)
filelist()
{
echo '%%defattr(-, root, root)'
pushd %buildroot >/dev/null
for i; do
if test -e usr/sbin/"$i"; then
echo /usr/sbin/"$i"
fi
if test -e usr/bin/"$i"; then
echo /usr/bin/"$i"
fi
if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then
echo "%%doc %_mandir/*/$i.[1-9]*"
fi
done
popd >/dev/null
}
filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat >mysql.files
filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files
filelist mysql_config >libmysqlclient-devel.files
filelist mysqlslap >mysql-bench.files
filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files
# all binaries that don't need to be in a "default" install (mysql.rpm +
# mysql-client.rpm)
filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files
filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files
filelist ndb_mgmd >mysql-ndb-management.files
filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files
filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files
### files not installed by make install
# Create directory structure
DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE)
DOCDIR=%buildroot%_defaultdocdir/%name
install -d -m 755 ${DOCDIR}
install -d -m 755 %buildroot/etc/logrotate.d
install -d -m 755 %buildroot/etc/init.d
install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
%if 0%{?prefered} > 0
install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so
%endif
install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf
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
# testsuite
mkdir -p '%buildroot'/usr/share/mysql-test/
install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/
# XXX this should go under /var/..., but some tests get confused by a symlink
# var -> ../../../var/...
#ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var
mkdir '%buildroot'/usr/share/mysql-test/var
# Final fixes
find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete
%if 0%{?suse_version} > 1030
%fdupes -s '%buildroot'/usr/share/mysql-test
%endif
%if 0%{?fedora_version} > 8
fdupes -q -n -r '%buildroot'/usr/share/mysql-test
%endif
dos2unixConversion() {
%{__sed} -i 's/\r//g' "$1"
}
for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do
dos2unixConversion "$i"
done
%if ! 0%{cluster} > 0
cat mysql-ndb-storage.files mysql-ndb-management.files \
mysql-ndb-tools.files mysql-ndb-extra.files | \
sed 's|^%%doc\ ||' | while read tmp; do
cd '%buildroot'
rm -f .$tmp
done
%endif
%if ! 0%{prefered} > 0
cat libmysqlclient-devel.files | while read tmp; do
cd '%buildroot'
rm -f .$tmp
done
rm -rf '%buildroot'/%_libdir/libmysqld.*
rm -rf '%buildroot'/%_libdir/*.la
rm -rf '%buildroot'/%_libdir/*.so
rm -rf '%buildroot'/%_libdir/*.a
rm -rf '%buildroot'/%_includedir
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
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

27
libmysql-no-pkglibdir.patch
View File

@ -1,27 +0,0 @@
---
libmysql/Makefile.shared | 2 +-
libmysqld/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- libmysql/Makefile.shared.orig
+++ libmysql/Makefile.shared
@@ -26,7 +26,7 @@ MYSQLBASEdir= $(prefix)
## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded
## until someone complains that they need separate options.
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target)
-pkglib_LTLIBRARIES = $(target)
+lib_LTLIBRARIES = $(target)
noinst_PROGRAMS = conf_to_src
--- libmysqld/Makefile.am.orig
+++ libmysqld/Makefile.am
@@ -36,7 +36,7 @@ INCLUDES= -I$(top_builddir)/include -I$
@condition_dependent_plugin_includes@
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
View File

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

69
mariadb.changes
View File

@ -1,3 +1,72 @@
-------------------------------------------------------------------
Tue Dec 7 11:27:24 CET 2010 - mhrusecky@suse.cz
- 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
- fixed building on Mandriva
-------------------------------------------------------------------
Mon Oct 18 22:53:09 CEST 2010 - mhrusecky@suse.cz
- rewritten spec file
- build and install parts are in separate file now
- patches in the archive
- contains more documentation
- contains tags
- adding/removing patches just at in one configuration file
-------------------------------------------------------------------
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

392
mariadb.spec
View File

@ -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 srv_vers 5.1.44
%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
%if %{?rel:0}%{!?rel:1}
%define rel 1
@ -29,65 +29,26 @@
#Packager: %packager
#Vendor: %vendor
Name: mariadb
Name: mariadb52
Summary: A True Multiuser, Multithreaded SQL Database Server
Version: 5.1.44
Release: 2
Version: 5.2.4
%define srv_vers 5.1.53
Release: 0
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
Group: Productivity/Databases/Servers
Url: http://www.mysql.com
# http://dev.mysql.com/get/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz/from/pick
Source: mariadb-%{version}b.tar.bz2
# 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
Source2: baselibs.conf
Source3: README.debug
Source4: suse-test-run
Source5: mysql.SuSEfirewall2
Source7: rc.mysql-multi
Source8: README.SuSE
# Polishing default config file
Patch2: mysql-cnf.patch
Patch3: mysql-multi-configuration.patch
# Adds option to set group to something else similarly to the user settings
Patch4: mysql-group.patch
# Warning about initscript in mysql_install_db disabled, since the SUSE RPM comes with an init script installed
Patch5: mysql-install_db-quiet.patch
# Checks flush-logs exit status in support-files/mysql-log-rotate.sh
Patch7: mysql-logrotate.patch
# Adds reload funcionality to mysqld_multi.sh perl script and adds --datadir support
Patch8: mysqld_multi.patch
# Disables failure on one test during update and improves error message during update a little bit
Patch13: mysql_upgrade-exit-status.patch
# Changes pkglib_LIBRARIES into lib_LIBRARIES in libmysql
Patch18: libmysql-no-pkglibdir.patch
# Adds option -avoid-version to LDFLAGS for plugins blackhole, archive and example
Patch19: mysql-plugins-avoid-version.patch
# This patch loads plugins by default if there is no settings regarding plugins.
Patch23: mysql-enable-plugins.patch
# PATCH-FIX-UPSTREAM mysql-5.1.31-shebang.patch [] mhrusecky@suse.cz -- adds mising shebangs
Patch25: mysql-5.1.31-shebang.patch
# PATCH-FIX-UPSTREAM mysql-5.1.35-test-variables-big.patch [upstream bug #38811] -- different way to test whether server crashed
# 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: 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.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
Patch35: mysql-5.1.35-test-utf8.patch
# PATCH-FIX-UPSTREAM mysql-5.1.36-bmove512.patch [ upstream#19975 ] mhrusecky@suse.cz -- using standard memcpy instead of bmove512 as it should be beeter
# http://bugs.mysql.com/bug.php?id=19975
Patch37: mysql-5.1.36-bmove512.patch
# PATCH-FIX-UPSTREAM mysql-5.1.36-hotcopy.patch [ upstream#43594, bnc#525325 ] mhrusecky@suse.cz -- hotcopy ignores log tables
# http://bugs.mysql.com/bug.php?id=43594
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
Source9: mysql-patches.tar.bz2
Source10: build.inc
Source11: install.inc
Source12: series
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
PreReq: pwdutils
@ -105,6 +66,9 @@ 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
@ -124,15 +88,15 @@ the Maria storage engine.
This package only contains the server-side programs.
%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.
@ -142,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.
@ -159,8 +123,8 @@ Authors:
%endif
%if 0%{?prefered} > 0
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%package -n libmysqlclient-devel
#-------------------------------------------------------------------------------
# mysql-devel was last used in openSUSE 10.2
@ -241,8 +205,8 @@ Authors:
David Axmark <davida@mysql.com>
%endif
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%package client
#-------------------------------------------------------------------------------
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
@ -282,7 +246,11 @@ Authors:
David Axmark <davida@mysql.com>
#-------------------------------------------------------------------------------
%if %{defined mdkversion}
%package debuging
%else
%package debug
%endif
#-------------------------------------------------------------------------------
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
Summary: MariaDB server with debug options turned on
@ -291,7 +259,11 @@ Requires: %{name} = %{srv_vers}
Provides: mysql-debug = %{srv_vers}
Conflicts: otherproviders(mysql-debug)
%if %{defined mdkversion}
%description debuging
%else
%description debug
%endif
A version of the mysql server that has some debug code turned on.
It should be only used to track down problems with the standard
servers. Note that merely installing this package won't replace the
@ -351,8 +323,8 @@ Authors:
David Axmark <davida@mysql.com>
%if 0%{?cluster} > 0
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%package ndb-storage
#-------------------------------------------------------------------------------
License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
@ -409,34 +381,20 @@ This package contains some extra ndbcluster storage engine tools for the
advanced user. They should be used with caution.
%endif
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%prep
#-------------------------------------------------------------------------------
%setup -q -n mariadb-%{version}b
%setup -q -n mariadb-%{version} -D -a 9
cp %_sourcedir/README.SuSE .
cp %_sourcedir/suse-test-run .
%patch2
%patch3
%patch4
%patch5
%patch7
%patch8
%patch13
%patch18
%patch19
%patch23
%patch25 -p1
%patch27
%patch28
%patch29
%patch30
%patch31
%patch35
%patch37
%patch38
%patch39
%patch45 -p1
# apply patches from series
ln -s mysql-patches/patches .
cp %_sourcedir/series patches
%if 0%{suse_version} < 1130
sed -i '/mysql-community-server-5.1.53-ssl-compilation-fix.patch/ d' patches/series
%endif
mysql-patches/apply-series.sh patches/series
# remove unneeded manpages ('make install' basically installs everything under
# man/*)
rm -f man/mysqlman.1 # dummy fallback manpage
@ -450,222 +408,21 @@ 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
#-------------------------------------------------------------------------------
%build
#-------------------------------------------------------------------------------
%if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0
%define socketpath /var/lib/mysql
%else
%define socketpath /var/run/mysql
%endif
autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"
# Make the compile a function, since we do multiple builds
BuildMySQL() {
# The --enable-assembler simply does nothing on systems that do not
# support assembler speedups.
suffix="$1"; shift
mkdir _build$suffix
pushd _build$suffix
../configure \
--enable-assembler \
--without-readline \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
--libexecdir=/usr/sbin \
--localstatedir=/var/lib/mysql \
--mandir=%{_mandir} \
--prefix=%{_prefix} \
--sysconfdir=/etc \
--with-mysqld-user=mysql \
--with-mysqld-group=mysql \
--without-debug \
--datadir=/usr/share \
--includedir=/usr/include \
--with-charset=utf8 \
--with-collation=utf8_unicode_ci \
--with-extra-charsets=all \
--with-unix-socket-path=%{socketpath}/mysql.sock \
--enable-thread-safe-client \
--with-comment="SUSE MariaDB RPM" \
--with-libwrap \
--with-server-suffix=$suffix \
%ifarch s390 s390x
--with-atomic-ops=rwlocks \
%else
--with-atomic-ops=smp \
%endif
--with-ssl=/usr \
--with-plugins=partition,csv,heap,myisam,ndbcluster,innobase \
HOSTNAME="/bin/hostname -f" \
"$@"
# Add this for MyISAM RAID support:
# --with-raid
# benchdir does not fit in above model. Fix when we make a separate package
make %{?jobs:-j%jobs}
nm --numeric-sort sql/mysqld > sql/mysqld.sym
# needed for make check, which is not VPATH aware
# copy the files unconditionally so that manual 'make check' after
# the build works, too
cp -a ../mysql-test/* mysql-test/
cp -a ../sql/share/{english,charsets} sql/share/
cp -a ../scripts/*.sql scripts/
%if %{?_with_testsuite:1}0
pushd mysql-test; perl ./mysql-test-run.pl --force; popd
%endif
popd
}
# Build the client, extra tools, libraries
BuildMySQL "" --with-embedded-server
# build mysqld-debug
BuildMySQL "-debug" --with-debug --without-embedded-server
%if 0%{?prefered} > 0
mkdir -p _buildlibmysqld/tmp
cd _buildlibmysqld/tmp
ar -x ../../_build/libmysqld/libmysqld.a
gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \
*.o \
-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
cd ..
rm -rf tmp
cd ..
%endif
%{expand:%(cat %_sourcedir/build.inc)}
#-------------------------------------------------------------------------------
%install
#-------------------------------------------------------------------------------
# install the debug server first, so that we don't overwrite the standard
# /usr/sbin/mysqld
mkdir -p %buildroot%_libdir/mysql
make -C _build-debug/sql install DESTDIR=%buildroot
mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym
# install the client, extra tools, libraries and the standard server
make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/
install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
# remove most static libs (FIXME: don't build them at all...)
rm -f %buildroot%_libdir/libmysqlclient*a
rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la
rm -f %buildroot%_libdir/mysql/plugin/*a
# XXX: package these? The ndb tools are linked statically atm
rm -f %buildroot%_libdir/mysql/libndbclient.*
rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run
rm -f %{buildroot}/usr/share/mysql-test/mtr
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run
mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
# generate filelist for binaries and their manpages (easier than enumerating
# all the binaries and manapages manually, esp. when there are new manpages in
# each release)
filelist()
{
echo '%%defattr(-, root, root)'
pushd %buildroot >/dev/null
for i; do
if test -e usr/sbin/"$i"; then
echo /usr/sbin/"$i"
fi
if test -e usr/bin/"$i"; then
echo /usr/bin/"$i"
fi
if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then
echo "%%doc %_mandir/*/$i.[1-9]*"
fi
done
popd >/dev/null
}
filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip >mysql.files
filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files
filelist mysql_config >libmysqlclient-devel.files
filelist mysqlslap >mysql-bench.files
filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files
# all binaries that don't need to be in a "default" install (mysql.rpm +
# mysql-client.rpm)
filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files
filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files
filelist ndb_mgmd >mysql-ndb-management.files
filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files
filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files
### files not installed by make install
# Create directory structure
DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE)
DOCDIR=%buildroot%_defaultdocdir/%name
install -d -m 755 ${DOCDIR}
install -d -m 755 %buildroot/etc/logrotate.d
install -d -m 755 %buildroot/etc/init.d
install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
%if 0%{?prefered} > 0
install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so
%endif
install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf
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
# testsuite
mkdir -p '%buildroot'/usr/share/mysql-test/
install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/
# XXX this should go under /var/..., but some tests get confused by a symlink
# var -> ../../../var/...
#ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var
mkdir '%buildroot'/usr/share/mysql-test/var
# Final fixes
find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete
%if 0%{?suse_version} > 1030
%fdupes -s '%buildroot'/usr/share/mysql-test
%endif
%if 0%{?fedora_version} > 8
fdupes -q -n -r '%buildroot'/usr/share/mysql-test
%endif
dos2unixConversion() {
%{__sed} -i 's/\r//g' "$1"
}
for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do
dos2unixConversion "$i"
done
%if ! 0%{cluster} > 0
cat mysql-ndb-storage.files mysql-ndb-management.files \
mysql-ndb-tools.files mysql-ndb-extra.files | \
sed 's|^%%doc\ ||' | while read tmp; do
cd '%buildroot'
rm -f .$tmp
done
%endif
%if ! 0%{prefered} > 0
cat libmysqlclient-devel.files | while read tmp; do
cd '%buildroot'
rm -f .$tmp
done
rm -rf '%buildroot'/%_libdir/libmysqld.*
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'/%_datadir/aclocal
%endif
sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql
ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair
ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze
ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize
%{expand:%(cat %_sourcedir/install.inc)}
#-------------------------------------------------------------------------------
%pre
#-------------------------------------------------------------------------------
/usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || :
@ -674,7 +431,6 @@ ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize
/usr/sbin/usermod -g mysql -s /bin/false mysql || :
#-------------------------------------------------------------------------------
%preun
#-------------------------------------------------------------------------------
[ $1 = 1 ] || /usr/sbin/rcmysql stop
@ -696,10 +452,9 @@ chown -Rv mysql:mysql var/mysql/
fi
#-------------------------------------------------------------------------------
%posttrans
#-------------------------------------------------------------------------------
%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.*
if [ -d /var/lib/mysql ]; then
touch /var/lib/mysql/.run-mysql_upgrade
chown -R mysql:mysql /var/lib/mysql
@ -714,72 +469,65 @@ if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d /var/run/mysql/restar
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
#-------------------------------------------------------------------------------
%endif
%if 0%{prefered} > 0
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%post -n libmysqlclient16
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%postun -n libmysqlclient16
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%post -n libmysqlclient_r16
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%postun -n libmysqlclient_r16
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%post -n libmysqld0
#-------------------------------------------------------------------------------
/sbin/ldconfig
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%postun -n libmysqld0
#-------------------------------------------------------------------------------
/sbin/ldconfig
@ -787,35 +535,33 @@ fi
%endif
#-------------------------------------------------------------------------------
%postun
#-------------------------------------------------------------------------------
if [ $1 = 0 ]; then
%install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.*
%{insserv_cleanup}
fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%clean
#-------------------------------------------------------------------------------
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf $RPM_BUILD_ROOT
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files -f mysql.files
#-------------------------------------------------------------------------------
%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.gz
%doc %{_infodir}/mysql.info.*
/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
@ -824,7 +570,6 @@ fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files client -f mysql-client.files
#-------------------------------------------------------------------------------
%defattr(-, root, root)
@ -833,25 +578,22 @@ 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
%if 0%{prefered} > 0
#-------------------------------------------------------------------------------
%files -n libmysqlclient-devel -f libmysqlclient-devel.files
#-------------------------------------------------------------------------------
%defattr(-, root, root)
@ -862,7 +604,6 @@ fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files -n libmysqld-devel
#-------------------------------------------------------------------------------
%defattr(-,root,root)
@ -871,7 +612,6 @@ fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files -n libmysqld0
#-------------------------------------------------------------------------------
%defattr(-,root,root)
@ -879,7 +619,6 @@ fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files -n libmysqlclient16
#-------------------------------------------------------------------------------
%defattr(-, root, root)
@ -887,7 +626,6 @@ fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files -n libmysqlclient_r16
#-------------------------------------------------------------------------------
%defattr(-, root, root)
@ -896,7 +634,6 @@ fi
%endif
#-------------------------------------------------------------------------------
%files bench -f mysql-bench.files
#-------------------------------------------------------------------------------
%defattr(-, root, root)
@ -904,8 +641,11 @@ fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%if %{defined mdkversion}
%files debuging
%else
%files debug
%endif
#-------------------------------------------------------------------------------
%defattr(-, root, root)
/usr/sbin/mysqld-debug
@ -913,7 +653,6 @@ fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files test -f mysql-test.files
#-------------------------------------------------------------------------------
%defattr(-, root, root)
@ -927,7 +666,6 @@ fi
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files tools -f mysql-tools.files
%defattr(-, root, root)
%_bindir/mysqlrepair
@ -937,22 +675,18 @@ fi
%if 0%{cluster} > 0
#-------------------------------------------------------------------------------
%files ndb-storage -f mysql-ndb-storage.files
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files ndb-management -f mysql-ndb-management.files
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files ndb-tools -f mysql-ndb-tools.files
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
%files ndb-extra -f mysql-ndb-extra.files
#-------------------------------------------------------------------------------
%endif

24
mysql-5.1.31-shebang.patch
View File

@ -1,24 +0,0 @@
diff -Naru mysql-5.1.31-bak/mysql-test/t/long_tmpdir-master.sh mysql-5.1.31/mysql-test/t/long_tmpdir-master.sh
--- mysql-5.1.31-bak/mysql-test/t/long_tmpdir-master.sh 2009-02-23 17:18:48.000000000 +0100
+++ mysql-5.1.31/mysql-test/t/long_tmpdir-master.sh 2009-02-24 17:57:42.000000000 +0100
@@ -1,3 +1,4 @@
+#!/bin/sh
d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789"
test -d "$d" || mkdir "$d"
rm -f "$d"/*
diff -Naru mysql-5.1.31-bak/mysql-test/t/lowercase_mixed_tmpdir-master.sh mysql-5.1.31/mysql-test/t/lowercase_mixed_tmpdir-master.sh
--- mysql-5.1.31-bak/mysql-test/t/lowercase_mixed_tmpdir-master.sh 2009-02-23 17:18:48.000000000 +0100
+++ mysql-5.1.31/mysql-test/t/lowercase_mixed_tmpdir-master.sh 2009-02-24 17:58:12.000000000 +0100
@@ -1,3 +1,4 @@
+#!/bin/sh
# This test requires a non-lowercase tmpdir directory on a case-sensitive
# filesystem.
diff -Naru mysql-5.1.31-bak/sql-bench/graph-compare-results.sh mysql-5.1.31/sql-bench/graph-compare-results.sh
--- mysql-5.1.31-bak/sql-bench/graph-compare-results.sh 2009-02-23 17:18:49.000000000 +0100
+++ mysql-5.1.31/sql-bench/graph-compare-results.sh 2009-02-24 18:00:16.000000000 +0100
@@ -1,3 +1,4 @@
+#/usr/bin/perl
####
#### Hello ... this is a heavily hacked script by Luuk
#### instead of printing the result it makes a nice gif

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

@ -1,20 +0,0 @@
--- 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);
}

20
mysql-5.1.33-scripts-paths.patch
View File

@ -1,20 +0,0 @@
--- scripts/Makefile.am 2009-04-02 18:29:00.292563355 +0200
+++ scripts/Makefile.am 2009-04-02 18:21:50.462559739 +0200
@@ -110,7 +110,7 @@
mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
mysql_system_tables_fix.sql
@echo "Building $@";
- @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@
+ @cat $(top_srcdir)/scripts/mysql_system_tables.sql $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@
#
# Build mysql_fix_privilege_tables_sql.c from
@@ -123,7 +123,7 @@
sleep 2
$(top_builddir)/scripts/comp_sql$(EXEEXT) \
mysql_fix_privilege_tables \
- $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
+ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@
SUFFIXES = .sh

11
mysql-5.1.33-ssl-lib64-macro.patch
View File

@ -1,11 +0,0 @@
--- config/ac-macros/ssl.m4 2009-04-10 14:05:07.000000000 +0200
+++ config/ac-macros/ssl.m4 2009-04-10 14:15:15.000000000 +0200
@@ -102,7 +102,7 @@
#
# Try to link with openSSL libs in <location>
#
- openssl_libs="-L$location/lib/ -lssl -lcrypto"
+ openssl_libs="-L$location/lib -L$location/lib64 -lssl -lcrypto"
MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
if test "$mysql_ssl_found" == "no"

79
mysql-5.1.35-test-utf8.patch
View File

@ -1,79 +0,0 @@
Index: mysql-test/r/information_schema.result
===================================================================
--- mysql-test/r/information_schema.result.orig
+++ mysql-test/r/information_schema.result
@@ -9,7 +9,7 @@ create user mysqltest_3@localhost;
create user mysqltest_3;
select * from information_schema.SCHEMATA where schema_name > 'm';
CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
-NULL mtr latin1 latin1_swedish_ci NULL
+NULL mtr utf8 utf8_unicode_ci NULL
NULL mysql latin1 latin1_swedish_ci NULL
NULL test latin1 latin1_swedish_ci NULL
select schema_name from information_schema.schemata;
Index: mysql-test/r/mysql_comments.result
===================================================================
--- mysql-test/r/mysql_comments.result.orig
+++ mysql-test/r/mysql_comments.result
@@ -13,23 +13,23 @@ drop trigger if exists t1_bi;
foofct("call 1")
call 1
Function sql_mode Create Function character_set_client collation_connection Database Collation
-foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx latin1 latin1_swedish_ci latin1_swedish_ci
+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx utf8 utf8_unicode_ci latin1_swedish_ci
foofct("call 2")
call 2
Function sql_mode Create Function character_set_client collation_connection Database Collation
-foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci
+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
-empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci
+empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci
id data
foo 42
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
-foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) latin1 latin1_swedish_ci latin1_swedish_ci
+foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) utf8 utf8_unicode_ci latin1_swedish_ci
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
-nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend latin1 latin1_swedish_ci latin1_swedish_ci
+nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend utf8 utf8_unicode_ci latin1_swedish_ci
Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation
-t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci
+t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci
Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation
-t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci
+t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci
id data
trig 12
"Pass 2 : --enable-comments"
@@ -40,23 +40,23 @@ trig 12
foofct("call 1")
call 1
Function sql_mode Create Function character_set_client collation_connection Database Collation
-foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line latin1 latin1_swedish_ci latin1_swedish_ci
+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line utf8 utf8_unicode_ci latin1_swedish_ci
foofct("call 2")
call 2
Function sql_mode Create Function character_set_client collation_connection Database Collation
-foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci
+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
-empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci
+empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci
id data
foo 42
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
-foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body latin1 latin1_swedish_ci latin1_swedish_ci
+foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body utf8 utf8_unicode_ci latin1_swedish_ci
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
-nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend latin1 latin1_swedish_ci latin1_swedish_ci
+nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend utf8 utf8_unicode_ci latin1_swedish_ci
Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation
-t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci
+t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci
Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation
-t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci
+t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci
id data
trig 12
End of 5.0 tests

32
mysql-5.1.35-test-variables-big.patch
View File

@ -1,32 +0,0 @@
Index: mysql-test/t/variables-big.test
===================================================================
--- mysql-test/t/variables-big.test.orig
+++ mysql-test/t/variables-big.test
@@ -40,22 +40,22 @@ SET SESSION transaction_prealloc_size=10
--replace_column 1 <Id> 6 <Time>
# Embedded server is hardcoded to show "Writing to net" as STATE.
--replace_result "Writing to net" "NULL"
-SHOW PROCESSLIST;
+SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size';
SET SESSION transaction_prealloc_size=1024*1024*1024*2;
--replace_column 1 <Id> 6 <Time>
--replace_result "Writing to net" "NULL"
-SHOW PROCESSLIST;
+SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size';
SET SESSION transaction_prealloc_size=1024*1024*1024*3;
--replace_column 1 <Id> 6 <Time>
--replace_result "Writing to net" "NULL"
-SHOW PROCESSLIST;
+SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size';
SET SESSION transaction_prealloc_size=1024*1024*1024*4;
--replace_column 1 <Id> 6 <Time>
--replace_result "Writing to net" "NULL"
-SHOW PROCESSLIST;
+SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size';
SET SESSION transaction_prealloc_size=1024*1024*1024*5;
--replace_column 1 <Id> 6 <Time>
--replace_result "Writing to net" "NULL"
-SHOW PROCESSLIST;
+SHOW VARIABLES WHERE VARIABLE_NAME='transaction_prealloc_size';
--enable_warnings

40
mysql-5.1.36-bmove512.patch
View File

@ -1,40 +0,0 @@
Index: mysys/mf_keycache.c
===================================================================
--- mysys/mf_keycache.c.orig
+++ mysys/mf_keycache.c
@@ -2646,10 +2646,7 @@ uchar *key_cache_read(KEY_CACHE *keycach
#endif
/* Copy data from the cache buffer */
- if (!(read_length & 511))
- bmove512(buff, block->buffer+offset, read_length);
- else
- memcpy(buff, block->buffer+offset, (size_t) read_length);
+ memcpy(buff, block->buffer+offset, (size_t) read_length);
#if !defined(SERIALIZED_READ_FROM_CACHE)
keycache_pthread_mutex_lock(&keycache->cache_lock);
@@ -2857,10 +2854,7 @@ int key_cache_insert(KEY_CACHE *keycache
#endif
/* Copy data from buff */
- if (!(read_length & 511))
- bmove512(block->buffer+offset, buff, read_length);
- else
- memcpy(block->buffer+offset, buff, (size_t) read_length);
+ memcpy(block->buffer+offset, buff, (size_t) read_length);
#if !defined(SERIALIZED_READ_FROM_CACHE)
keycache_pthread_mutex_lock(&keycache->cache_lock);
@@ -3164,10 +3158,7 @@ int key_cache_write(KEY_CACHE *keycache,
#if !defined(SERIALIZED_READ_FROM_CACHE)
keycache_pthread_mutex_unlock(&keycache->cache_lock);
#endif
- if (!(read_length & 511))
- bmove512(block->buffer+offset, buff, read_length);
- else
- memcpy(block->buffer+offset, buff, (size_t) read_length);
+ memcpy(block->buffer+offset, buff, (size_t) read_length);
#if !defined(SERIALIZED_READ_FROM_CACHE)
keycache_pthread_mutex_lock(&keycache->cache_lock);

30
mysql-5.1.36-hotcopy.patch
View File

@ -1,30 +0,0 @@
=== modified file 'scripts/mysqlhotcopy.sh'
--- scripts/mysqlhotcopy.sh 2008-03-07 20:45:40 +0000
+++ scripts/mysqlhotcopy.sh 2009-03-12 13:06:42 +0000
@@ -777,7 +777,24 @@ sub get_list_of_tables {
} || [];
warn "Unable to retrieve list of tables in $db: $@" if $@;
- return (map { $_->[0] } @$tables);
+ my @ignore_tables = ();
+
+ # Ignore tables for the mysql database
+ if ($db eq 'mysql') {
+ @ignore_tables = qw(general_log slow_log schema apply_status);
+ }
+
+ my @res = ();
+ if ($#ignore_tables > 1) {
+ my @tmp = (map { $_->[0] } @$tables);
+ for my $t (@tmp) {
+ push(@res, $t) if not exists { map { $_=>1 } @ignore_tables }->{$t};
+ }
+ } else {
+ @res = (map { $_->[0] } @$tables);
+ }
+
+ return @res;
}
sub quote_names {

38
mysql-5.1.42-myslq-test.patch
View File

@ -1,38 +0,0 @@
Index: mysql-test/Makefile.am
===================================================================
--- mysql-test/Makefile.am.orig
+++ mysql-test/Makefile.am
@@ -17,7 +17,7 @@
## Process this file with automake to create Makefile.in
-testroot = $(prefix)
+testroot = $(datadir)
testdir = $(testroot)/mysql-test
test_SCRIPTS = mtr \
Index: mysql-test/lib/My/SafeProcess/Makefile.am
===================================================================
--- mysql-test/lib/My/SafeProcess/Makefile.am.orig
+++ mysql-test/lib/My/SafeProcess/Makefile.am
@@ -13,7 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-testroot = $(prefix)
+testroot = $(datadir)
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]);

72
mysql-cnf.patch
View File

@ -1,72 +0,0 @@
Index: support-files/my-huge.cnf.sh
===================================================================
--- support-files/my-huge.cnf.sh.orig
+++ support-files/my-huge.cnf.sh
@@ -131,6 +131,10 @@ server-id = 1
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50
+# The safe_mysqld script
+[safe_mysqld]
+log-error=/var/log/mysql/mysqld.log
+
[mysqldump]
quick
max_allowed_packet = 16M
Index: support-files/my-large.cnf.sh
===================================================================
--- support-files/my-large.cnf.sh.orig
+++ support-files/my-large.cnf.sh
@@ -131,6 +131,10 @@ server-id = 1
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50
+# The safe_mysqld script
+[safe_mysqld]
+log-error=/var/log/mysql/mysqld.log
+
[mysqldump]
quick
max_allowed_packet = 16M
Index: support-files/my-medium.cnf.sh
===================================================================
--- support-files/my-medium.cnf.sh.orig
+++ support-files/my-medium.cnf.sh
@@ -26,6 +26,8 @@ socket = @MYSQL_UNIX_ADDR@
[mysqld]
port = @MYSQL_TCP_PORT@
socket = @MYSQL_UNIX_ADDR@
+# Change following line if you want to store your database elsewhere
+datadir = /var/lib/mysql
skip-locking
key_buffer_size = 16M
max_allowed_packet = 1M
@@ -129,7 +131,13 @@ server-id = 1
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50
+# The safe_mysqld script
+[safe_mysqld]
+log-error = /var/log/mysql/mysqld.log
+socket = @MYSQL_UNIX_ADDR@
+
[mysqldump]
+socket = @MYSQL_UNIX_ADDR@
quick
max_allowed_packet = 16M
Index: support-files/my-small.cnf.sh
===================================================================
--- support-files/my-small.cnf.sh.orig
+++ support-files/my-small.cnf.sh
@@ -65,6 +65,10 @@ server-id = 1
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50
+# The safe_mysqld script
+[safe_mysqld]
+log-error = /var/log/mysql/mysqld.log
+
[mysqldump]
quick
max_allowed_packet = 16M

63
mysql-enable-plugins.patch
View File

@ -1,63 +0,0 @@
diff -Naru scripts/mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sql
--- scripts/mysql_fix_privilege_tables.sql 2008-11-14 18:03:14.000000000 +0100
+++ scripts/mysql_fix_privilege_tables.sql 2009-01-09 18:57:47.000000000 +0100
@@ -24,6 +24,17 @@
CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins';
+-- Remember for later if plugin table already existed
+set @had_plugin_table= @@warning_count != 0;
+
+-- Install plugins by default if they didn't existed
+CREATE TEMPORARY TABLE tmp_plugin LIKE plugin;
+INSERT INTO tmp_plugin (name,dl) VALUES ('ARCHIVE','ha_archive.so');
+INSERT INTO tmp_plugin (name,dl) VALUES ('FEDERATED','ha_federated.so');
+INSERT INTO tmp_plugin (name,dl) VALUES ('BLACKHOLE','ha_blackhole.so');
+INSERT INTO tmp_plugin (name,dl) VALUES ('EXAMPLE','ha_example.so');
+INSERT INTO plugin SELECT * FROM tmp_plugin WHERE @had_plugin_table=0;
+DROP TABLE tmp_plugin;
CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table';
diff -Naru scripts/mysql_fix_privilege_tables_sql.c scripts/mysql_fix_privilege_tables_sql.c
--- scripts/mysql_fix_privilege_tables_sql.c 2008-11-14 18:03:19.000000000 +0100
+++ scripts/mysql_fix_privilege_tables_sql.c 2009-01-09 19:02:35.000000000 +0100
@@ -36,6 +36,17 @@
"\n "
"CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins';\n "
"\n "
+"-- Remember for later if plugin table already existed\n "
+"set @had_plugin_table= @@warning_count != 0;\n "
+"\n "
+"-- Install plugins by default if they didn't existed\n "
+"CREATE TEMPORARY TABLE tmp_plugin LIKE plugin;\n "
+"INSERT INTO tmp_plugin (name,dl) VALUES ('ARCHIVE','ha_archive.so');\n "
+"INSERT INTO tmp_plugin (name,dl) VALUES ('FEDERATED','ha_federated.so');\n "
+"INSERT INTO tmp_plugin (name,dl) VALUES ('BLACKHOLE','ha_blackhole.so');\n "
+"INSERT INTO tmp_plugin (name,dl) VALUES ('EXAMPLE','ha_example.so');\n "
+"INSERT INTO plugin SELECT * FROM tmp_plugin WHERE @had_plugin_table=0;\n "
+"DROP TABLE tmp_plugin;\n "
"\n "
"CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table';\n "
"\n "
diff -Naru scripts/mysql_system_tables.sql scripts/mysql_system_tables.sql
--- scripts/mysql_system_tables.sql 2008-11-14 17:37:05.000000000 +0100
+++ scripts/mysql_system_tables.sql 2009-01-09 19:00:35.000000000 +0100
@@ -24,6 +24,17 @@
CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins';
+-- Remember for later if plugin table already existed
+set @had_plugin_table= @@warning_count != 0;
+
+-- Install plugins by default if they didn't existed
+CREATE TEMPORARY TABLE tmp_plugin LIKE plugin;
+INSERT INTO tmp_plugin (name,dl) VALUES ('ARCHIVE','ha_archive.so');
+INSERT INTO tmp_plugin (name,dl) VALUES ('FEDERATED','ha_federated.so');
+INSERT INTO tmp_plugin (name,dl) VALUES ('BLACKHOLE','ha_blackhole.so');
+INSERT INTO tmp_plugin (name,dl) VALUES ('EXAMPLE','ha_example.so');
+INSERT INTO plugin SELECT * FROM tmp_plugin WHERE @had_plugin_table=0;
+DROP TABLE tmp_plugin;
CREATE TABLE IF NOT EXISTS servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table';

148
mysql-group.patch
View File

@ -1,148 +0,0 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -772,6 +772,14 @@ AC_ARG_WITH(mysqld-user,
[ MYSQLD_USER=mysql ]
)
AC_SUBST(MYSQLD_USER)
+AC_ARG_WITH(mysqld-group,
+ [ --with-mysqld-group=groupname
+ What group the mysqld daemon shall be run as.],
+ [ MYSQLD_GROUP=$withval ],
+ [ MYSQLD_GROUP=mysql ]
+ )
+AC_SUBST(MYSQLD_GROUP)
+
# If we should allow LOAD DATA LOCAL
AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default)
Index: scripts/Makefile.am
===================================================================
--- scripts/Makefile.am.orig
+++ scripts/Makefile.am
@@ -185,6 +185,7 @@ SUFFIXES = .sh
-e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
-e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
+ -e 's!@''MYSQLD_GROUP''@!@MYSQLD_GROUP@!' \
-e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \
-e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \
-e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \
Index: scripts/mysqld_safe.sh
===================================================================
--- scripts/mysqld_safe.sh.orig
+++ scripts/mysqld_safe.sh
@@ -19,6 +19,7 @@ logging=init
want_syslog=0
syslog_tag=
user='@MYSQLD_USER@'
+group='@MYSQLD_GROUP@'
pid_file=
err_log=
@@ -162,6 +163,7 @@ parse_arguments() {
--datadir=*) DATADIR="$val" ;;
--pid-file=*) pid_file="$val" ;;
--user=*) user="$val"; SET_USER=1 ;;
+ --group=*) group="$val"; SET_USER=1 ;;
# these might have been set in a [mysqld_safe] section of my.cnf
# they are added to mysqld command line to override settings from my.cnf
@@ -388,11 +390,17 @@ then
if test "$user" != "root" -o $SET_USER = 1
then
USER_OPTION="--user=$user"
+ GROUP_OPTION="--group=$group"
fi
# Change the err log to the right user, if it is in use
if [ $want_syslog -eq 0 ]; then
touch "$err_log"
- chown $user "$err_log"
+ if [ "$user" -a "$group" ]; then
+ chown $user:$group $err_log
+ else
+ [ "$user" ] && chown $user $err_log
+ [ "$group" ] && chgrp $group $err_log
+ fi
fi
if test -n "$open_files"
then
@@ -407,7 +415,12 @@ mysql_unix_port_dir=`dirname $safe_mysql
if [ ! -d $mysql_unix_port_dir ]
then
mkdir $mysql_unix_port_dir
- chown $user $mysql_unix_port_dir
+ if [ "$user" -a "$group" ]; then
+ chown $user:$group $mysql_unix_port_dir
+ else
+ [ "$user" ] && chown $user $mysql_unix_port_dir
+ [ "$group" ] && chgrp $group $mysql_unix_port_dir
+ fi
chmod 755 $mysql_unix_port_dir
fi
Index: scripts/mysql_install_db.sh
===================================================================
--- scripts/mysql_install_db.sh.orig
+++ scripts/mysql_install_db.sh
@@ -28,6 +28,7 @@ args=""
defaults=""
mysqld_opt=""
user=""
+group=""
force=0
in_rpm=0
@@ -63,6 +64,11 @@ Usage: $0 [OPTIONS]
user. You must be root to use this option. By default
mysqld runs using your current login name and files and
directories that it creates will be owned by you.
+ --group=group_name The login group to use for running mysqld. Files and
+ directories created by mysqld will be owned by this
+ group. You must be root to use this option. By default
+ mysqld runs using your current group and files and
+ directories that it creates will be owned by you.
All other options are passed to the mysqld program
@@ -103,11 +109,11 @@ parse_arguments()
--builddir=*) builddir=`parse_arg "$arg"` ;;
--srcdir=*) srcdir=`parse_arg "$arg"` ;;
--ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;;
- --user=*)
# Note that the user will be passed to mysqld so that it runs
# as 'user' (crucial e.g. if log-bin=/some_other_path/
# where a chown of datadir won't help)
- user=`parse_arg "$arg"` ;;
+ --user=*) user=`parse_arg "$arg"` ;;
+ --group=*) group=`parse_arg "$arg"` ;;
--skip-name-resolve) ip_only=1 ;;
--verbose) verbose=1 ;; # Obsolete
--rpm) in_rpm=1 ;;
@@ -360,7 +366,12 @@ do
fi
if test -w / -a ! -z "$user"
then
- chown $user $dir
+ if test -z "$group"
+ then
+ chown $user $dir
+ else
+ chown $user:$group $dir
+ fi
fi
done
@@ -369,6 +380,11 @@ then
args="$args --user=$user"
fi
+if test -n "$group"
+then
+ args="$args --group=$group"
+fi
+
# When doing a "cross bootstrap" install, no reference to the current
# host should be added to the system tables. So we filter out any
# lines which contain the current host name.

33
mysql-install_db-quiet.patch
View File

@ -1,33 +0,0 @@
Index: scripts/mysql_install_db.sh
===================================================================
--- scripts/mysql_install_db.sh.orig
+++ scripts/mysql_install_db.sh
@@ -456,9 +456,11 @@ fi
# the screen.
if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
then
- s_echo
- s_echo "To start mysqld at boot time you have to copy"
- s_echo "support-files/mysql.server to the right place for your system"
+# SuSE Installs init script ;-)
+#
+# s_echo
+# s_echo "To start mysqld at boot time you have to copy"
+# s_echo "support-files/mysql.server to the right place for your system"
echo
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !"
@@ -480,10 +482,10 @@ then
then
echo
echo "You can start the MariaDB daemon with:"
- echo "cd $basedir ; $bindir/mysqld_safe &"
+ echo "rcmysql start"
echo
- echo "You can test the MariaDB daemon with mysql-test-run.pl"
- echo "cd $basedir/mysql-test ; perl mysql-test-run.pl"
+ echo "You can test the MariaDB daemon with mariadb-test package"
+# echo "cd $basedir/mysql-test ; perl mysql-test-run.pl"
fi
echo

28
mysql-logrotate.patch
View File

@ -1,28 +0,0 @@
Index: support-files/mysql-log-rotate.sh
===================================================================
--- support-files/mysql-log-rotate.sh.orig
+++ support-files/mysql-log-rotate.sh
@@ -18,7 +18,7 @@
# ATTENTION: This /root/.my.cnf should be readable ONLY
# for root !
-@localstatedir@/mysqld.log {
+/var/log/mysql/mysqld.log {
# create 600 mysql mysql
notifempty
daily
@@ -31,6 +31,14 @@
@bindir@/mysqladmin ping &>/dev/null
then
@bindir@/mysqladmin flush-logs
+ ret=$?
+ if test $ret -ne 0
+ then
+ echo "@sysconfdir@/logrotate.d/mysql failed, probably because" >&2
+ echo "the root acount is protected by password." >&2
+ echo "See comments in @sysconfdir@/logrotate.d/mysql on how to fix this" >&2
+ exit $ret
+ fi
fi
endscript
}

53
mysql-multi-configuration.patch
View File

@ -1,53 +0,0 @@
---
support-files/my-medium.cnf.sh | 43 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
--- support-files/my-medium.cnf.sh.orig
+++ support-files/my-medium.cnf.sh
@@ -158,3 +158,46 @@ write_buffer = 2M
[mysqlhotcopy]
interactive-timeout
+
+[mysqld_multi]
+mysqld = /usr/bin/mysqld_safe
+mysqladmin = /usr/bin/mysqladmin
+log = /var/log/mysqld_multi.log
+# user = multi_admin
+# password = secret
+
+# If you want to use mysqld_multi uncomment 1 or more mysqld sections
+# below or add your own ones.
+
+# WARNING
+# --------
+# If you uncomment mysqld1 than make absolutely sure, that database mysql,
+# configured above, is not started. This may result in corrupted data!
+# [mysqld1]
+# port = @MYSQL_TCP_PORT@
+# datadir = /var/lib/mysql
+# pid-file = /var/lib/mysql/mysqld.pid
+# socket = /var/lib/mysql/mysql.sock
+# user = mysql
+
+# [mysqld2]
+# port = 3307
+# datadir = /var/lib/mysql-databases/mysqld2
+# pid-file = /var/lib/mysql-databases/mysqld2/mysql.pid
+# socket = /var/lib/mysql-databases/mysqld2/mysql.sock
+# user = mysql
+
+# [mysqld3]
+# port = 3308
+# datadir = /var/lib/mysql-databases/mysqld3
+# pid-file = /var/lib/mysql-databases/mysqld3/mysql.pid
+# socket = /var/lib/mysql-databases/mysqld3/mysql.sock
+# user = mysql
+
+# [mysqld6]
+# port = 3309
+# datadir = /var/lib/mysql-databases/mysqld6
+# pid-file = /var/lib/mysql-databases/mysqld6/mysql.pid
+# socket = /var/lib/mysql-databases/mysqld6/mysql.sock
+# user = mysql
+

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

@ -1,104 +0,0 @@
Index: storage/archive/Makefile.am
===================================================================
--- storage/archive/Makefile.am.orig
+++ storage/archive/Makefile.am
@@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r
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_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_archive_la_SOURCES = ha_archive.cc azio.c
Index: storage/blackhole/Makefile.am
===================================================================
--- storage/blackhole/Makefile.am.orig
+++ storage/blackhole/Makefile.am
@@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h
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_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 = 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_CFLAGS) -DMYSQL_PLUGIN
ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc
Index: storage/example/Makefile.am
===================================================================
--- storage/example/Makefile.am.orig
+++ storage/example/Makefile.am
@@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h
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
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
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= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
Index: storage/ibmdb2i/Makefile.am
===================================================================
--- storage/ibmdb2i/Makefile.am.orig
+++ storage/ibmdb2i/Makefile.am
@@ -33,7 +33,7 @@ noinst_HEADERS = ha_ibmdb2i.h db2i_colla
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_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
@@ -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_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 @@ libinnobase_a_CFLAGS= $(AM_CFLAGS)
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)

11
mysql_config.patch
View File

@ -1,11 +0,0 @@
--- scripts/mysql_config.sh.orig
+++ scripts/mysql_config.sh
@@ -92,7 +92,7 @@ fix_path pkgincludedir include/mysql inc
version='@VERSION@'
socket='@MYSQL_UNIX_ADDR@'
-ldflags='@LDFLAGS@'
+ldflags='@SAVE_LDFLAGS@'
if [ @MYSQL_TCP_PORT_DEFAULT@ -eq 0 ]; then
port=0

31
mysql_upgrade-exit-status.patch
View File

@ -1,31 +0,0 @@
returning non-zero exit status in this case is not nice to scripts using
mysql_upgrade (eg. our init script)
---
client/mysql_upgrade.c | 4 +++-
mysql-test/t/mysql_upgrade.test | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
--- client/mysql_upgrade.c.orig
+++ client/mysql_upgrade.c
@@ -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);
- die(NULL);
+ free_used_memory();
+ my_end(MY_CHECK_ERROR);
+ exit(0);
}
/*
--- mysql-test/t/mysql_upgrade.test.orig
+++ mysql-test/t/mysql_upgrade.test
@@ -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 --skip-verbose 2>&1
# It should have created a file in the MySQL Servers datadir

176
mysqld_multi.patch
View File

@ -1,176 +0,0 @@
---
scripts/mysqld_multi.sh | 108 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 100 insertions(+), 8 deletions(-)
Index: scripts/mysqld_multi.sh
===================================================================
--- scripts/mysqld_multi.sh.orig
+++ scripts/mysqld_multi.sh
@@ -2,6 +2,7 @@
use Getopt::Long;
use POSIX qw(strftime getcwd);
+use File::Path qw(mkpath);
$|=1;
$VER="2.16";
@@ -123,6 +124,7 @@ sub main
usage() if (!defined($ARGV[0]) ||
(!($ARGV[0] =~ m/^start$/i) &&
!($ARGV[0] =~ m/^stop$/i) &&
+ !($ARGV[0] =~ m/^reload$/i) &&
!($ARGV[0] =~ m/^report$/i)));
if (!$opt_no_log)
@@ -136,7 +138,7 @@ sub main
print strftime "%a %b %e %H:%M:%S %Y", localtime;
print "\n";
}
- if ($ARGV[0] =~ m/^start$/i)
+ if (($ARGV[0] =~ m/^start$/i) || ($ARGV[0] =~ m/^reload$/i))
{
if (!defined(($mysqld= my_which($opt_mysqld))) && $opt_verbose)
{
@@ -145,7 +147,11 @@ sub main
print "This is OK, if you are using option \"mysqld=...\" in ";
print "groups [mysqldN] separately for each.\n\n";
}
- start_mysqlds();
+ if ($ARGV[0] =~ m/^start$/i) {
+ start_mysqlds();
+ } elsif ($ARGV[0] =~ m/^reload$/i) {
+ reload_mysqlds();
+ }
}
else
{
@@ -301,6 +307,39 @@ sub start_mysqlds()
$com= "$mysqld";
for ($j = 0, $tmp= ""; defined($options[$j]); $j++)
{
+ if ("--datadir=" eq substr($options[$j], 0, 10)) {
+ $datadir = $options[$j];
+ $datadir =~ s/\-\-datadir\=//;
+ eval { mkpath($datadir) };
+ if ($@) {
+ print "FATAL ERROR: Cannot create data directory $datadir: $!\n";
+ exit(1);
+ }
+ if (! -d $datadir."/mysql") {
+ if (-w $datadir) {
+ print "\n\nInstalling new database in $datadir\n\n";
+ $install_cmd="@bindir@/mysql_install_db ";
+ $install_cmd.="--user=mysql ";
+ $install_cmd.="--datadir=$datadir";
+ system($install_cmd);
+ } else {
+ print "\n";
+ print "FATAL ERROR: Tried to create mysqld under group [$groups[$i]],\n";
+ print "but the data directory is not writable.\n";
+ print "data directory used: $datadir\n";
+ exit(1);
+ }
+ }
+
+ if (! -d $datadir."/mysql") {
+ print "\n";
+ print "FATAL ERROR: Tried to start mysqld under group [$groups[$i]],\n";
+ print "but no data directory was found or could be created.\n";
+ print "data directory used: $datadir\n";
+ exit(1);
+ }
+ }
+
if ("--mysqladmin=" eq substr($options[$j], 0, 13))
{
# catch this and ignore
@@ -365,6 +404,58 @@ sub start_mysqlds()
}
####
+#### reload multiple servers
+####
+
+sub reload_mysqlds()
+{
+ my (@groups, $com, $tmp, $i, @options, $j);
+
+ if (!$opt_no_log)
+ {
+ w2log("\nReloading MySQL servers\n","$opt_log",0,0);
+ }
+ else
+ {
+ print "\nReloading MySQL servers\n";
+ }
+ @groups = &find_groups($groupids);
+ for ($i = 0; defined($groups[$i]); $i++)
+ {
+ $mysqld_server = $mysqld;
+ @options = defaults_for_group($groups[$i]);
+
+ for ($j = 0, $tmp= ""; defined($options[$j]); $j++)
+ {
+ if ("--mysqladmin=" eq substr($options[$j], 0, 13))
+ {
+ # catch this and ignore
+ }
+ elsif ("--mysqld=" eq substr($options[$j], 0, 9))
+ {
+ $options[$j] =~ s/\-\-mysqld\=//;
+ $mysqld_server = $options[$j];
+ }
+ elsif ("--pid-file=" eq substr($options[$j], 0, 11))
+ {
+ $options[$j] =~ s/\-\-pid-file\=//;
+ $pid_file = $options[$j];
+ }
+ }
+ $com = "killproc -p $pid_file -HUP $mysqld_server";
+ system($com);
+
+ $com = "touch $pid_file";
+ system($com);
+ }
+ if (!$i && !$opt_no_log)
+ {
+ w2log("No MySQL servers to be reloaded (check your GNRs)",
+ "$opt_log", 0, 0);
+ }
+}
+
+###
#### stop multiple servers
####
@@ -727,7 +818,7 @@ sub usage
$my_progname version $VER by Jani Tolonen
Description:
-$my_progname can be used to start, or stop any number of separate
+$my_progname can be used to start, reload, or stop any number of separate
mysqld processes running in different TCP/IP ports and UNIX sockets.
$my_progname can read group [mysqld_multi] from my.cnf file. You may
@@ -745,16 +836,16 @@ starting from 1. These groups should be
[mysqld] group, but with those port, socket and any other options
that are to be used with each separate mysqld process. The number
in the group name has another function; it can be used for starting,
-stopping, or reporting any specific mysqld server.
+reloading, stopping, or reporting any specific mysqld server.
-Usage: $my_progname [OPTIONS] {start|stop|report} [GNR,GNR,GNR...]
-or $my_progname [OPTIONS] {start|stop|report} [GNR-GNR,GNR,GNR-GNR,...]
+Usage: $my_progname [OPTIONS] {start|reload|stop|report} [GNR,GNR,GNR...]
+or $my_progname [OPTIONS] {start|reload|stop|report} [GNR-GNR,GNR,GNR-GNR,...]
-The GNR means the group number. You can start, stop or report any GNR,
+The GNR means the group number. You can start, reload, stop or report any GNR,
or several of them at the same time. (See --example) The GNRs list can
be comma separated or a dash combined. The latter means that all the
GNRs between GNR1-GNR2 will be affected. Without GNR argument all the
-groups found will either be started, stopped, or reported. Note that
+groups found will either be started, reloaded, stopped, or reported. Note that
syntax for specifying GNRs must appear without spaces.
Options:

186
project.diff
View File

@ -1,186 +0,0 @@
--- 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

2
rc.mysql-multi
View File

@ -251,6 +251,8 @@ 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

0
ready Normal file
View File

20
series Normal file
View File

@ -0,0 +1,20 @@
mysql-community-server-5.1.31-shebang.patch
mysql-community-server-5.1.33-scripts-paths.patch
mysql-community-server-5.1.33-ssl-lib64-macro.patch
mysql-community-server-5.1.36-bmove512.patch
mysql-community-server-5.1.36-hotcopy.patch
mysql-community-server-5.1.45-group.patch
mysql-community-server-5.1.45-multi-configuration.patch
mysql-community-server-5.1.45-safe-process-in-bin.patch
mysql-community-server-5.1.46-logrotate.patch
mariadb-5.1.50-strncat-overflow.patch
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
mysql-community-server-5.1.53-ssl-compilation-fix.patch
mariadb-5.2.4-compilation-fix.patch