Hello community,
here is the log from the commit of package mariadb for openSUSE:12.2 checked in at 2012-06-28 15:33:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/mariadb (Old)
and /work/SRC/openSUSE:12.2/.mariadb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:12.2/mariadb/mariadb.changes 2012-06-25 15:46:05.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.mariadb.new/mariadb.changes 2012-06-28 15:33:28.000000000 +0200
@@ -1,0 +2,23 @@
+Mon Jun 25 14:05:10 CEST 2012 - mhrusecky@suse.cz
+
+- splitted out error messages and put them into diferent directory
+
+-------------------------------------------------------------------
+Sat Jun 23 09:52:00 CEST 2012 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.5.25
+ * Release notes:
+ http://kb.askmonty.org/v/mariadb-5525-release-notes
+ * Changelog:
+ http://kb.askmonty.org/v/mariadb-5525-changelog
+
+-------------------------------------------------------------------
+Tue Jun 19 10:52:13 CEST 2012 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.5.24
+ * Release notes:
+ http://kb.askmonty.org/v/mariadb-5524-release-notes
+ * Changelog:
+ http://kb.askmonty.org/v/mariadb-5524-changelog
+
+-------------------------------------------------------------------
Old:
----
mariadb-5.5.23.tar.bz2
New:
----
mariadb-5.5.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb.spec ++++++
--- /var/tmp/diff_new_pack.hw6tOJ/_old 2012-06-28 15:33:29.000000000 +0200
+++ /var/tmp/diff_new_pack.hw6tOJ/_new 2012-06-28 15:33:29.000000000 +0200
@@ -34,9 +34,9 @@
Name: mariadb
Summary: Server part of MariaDB
-Version: 5.5.23
+Version: 5.5.25
Release: 1
-%define srv_vers 5.5.23
+%define srv_vers 5.5.25
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Productivity/Databases/Servers
Url: http://www.mariab.org
@@ -76,6 +76,7 @@
%endif
# required by rcmysql
Requires: %{name}-client perl-base
+Requires: %{name}-errormessages = %version
Provides: mysql-Max = %{srv_vers}
Provides: mysql = %{srv_vers}
%if 0%{?use_extra_provides} > 0
@@ -163,6 +164,7 @@
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-client = %{version}
Obsoletes: %{extra_provides}-client < %{version}
+Requires: %{name}-errormessages = %version
%endif
%if 0%{?prefered} > 0
Obsoletes: mysql-client < %{srv_vers}
@@ -172,6 +174,14 @@
%description client
This package contains the standard clients for MariaDB.
+%package errormessages
+Summary: MySQL Community Server development header files and libraries
+Group: Development/Libraries/C and C++
+
+%description errormessages
+This package provides the translated error messages for the standalone
+server daemon as well as the embedded server
+
%package bench
Requires: %{name}-client perl-DBD-mysql
License: SUSE-GPL-2.0-with-FLOSS-exception
@@ -339,7 +349,9 @@
# remove unneeded manpages ('make install' basically installs everything under
# man/*)
rm -f man/mysqlman.1 # dummy fallback manpage
+[ \! -f man/CMakeLists.txt ] || sed -i 's|mysqlman.1||' man/CMakeLists.txt
rm -f man/mysql.server.1 # init script, not installed in our rpm
+[ \! -f man/CMakeLists.txt ] || sed -i 's|mysql.server.1||' man/CMakeLists.txt
rm -f man/make_win_*.1 # windows build scripts
rm -f man/comp_err.1 # built-time utility
# 5.1 Carrier Grade Edition only / still under development as of 5.1.22
@@ -452,7 +464,12 @@
%doc %{_infodir}/mysql.info.*
/etc/init.d/mysql
/usr/sbin/rcmysql
-/usr/share/mysql/
+%dir /usr/share/%{name}
+%dir /usr/share/mysql
+/usr/share/%{name}/charsets/
+/usr/share/mysql/*.cnf
+/usr/share/mysql/*.ini
+/usr/share/%{name}/*.sql
%ghost %dir %attr(755,mysql,mysql)/var/run/mysql
%dir %{_libdir}/mysql
%{_libdir}/mysql/mysqld.sym
@@ -460,6 +477,10 @@
%dir %_libdir/mysql/plugin
%_libdir/mysql/plugin/[!d]*.so
+%files errormessages -f errormessages.files
+%defattr(-, root, root)
+/usr/share/%{name}/*/errmsg.sys
+
%files client -f mysql-client.files
%defattr(-, root, root)
%config(noreplace) %attr(0640, root, mysql) /etc/mysqlaccess.conf
@@ -487,9 +508,6 @@
%files -n libmariadbclient18
%defattr(-, root, root)
%{_libdir}/libmariadbclient.so.*
-%dir %_libdir/mysql
-%dir %_libdir/mysql/plugin
-%_libdir/mysql/plugin/dialog*.so
%if 0%{cluster} > 1
++++++ build.inc ++++++
--- /var/tmp/diff_new_pack.hw6tOJ/_old 2012-06-28 15:33:29.000000000 +0200
+++ /var/tmp/diff_new_pack.hw6tOJ/_new 2012-06-28 15:33:29.000000000 +0200
@@ -6,7 +6,7 @@
%if 0%{?suse_version} > 1140
export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter "
%endif
-export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DFORCE_INIT_OF_VARS $WARN_DIS "
+export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS "
export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"
%if 0%{use_cmake} < 1
@@ -102,6 +102,7 @@
-DWITH_LIBEDIT=0 \
-DINSTALL_LAYOUT=RPM \
-DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \
+ -DINSTALL_MYSQLSHAREDIR=/usr/share/%{name} \
-DWITH_COMMENT="openSUSE MySQL rpm" \
-DWITH_EXTRA_CHARSET=all \
-DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \
++++++ configuration-tweaks.tar.bz2 ++++++
++++++ install.inc ++++++
--- /var/tmp/diff_new_pack.hw6tOJ/_old 2012-06-28 15:33:29.000000000 +0200
+++ /var/tmp/diff_new_pack.hw6tOJ/_new 2012-06-28 15:33:29.000000000 +0200
@@ -20,6 +20,11 @@
rm -f %buildroot%_libdir/mysql/libndbclient.*
rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run
rm -f %{buildroot}/usr/share/mysql-test/mtr
+rm -f %{buildroot}/usr/share/mysql/binary-configure
+rm -f %{buildroot}/usr/share/mysql/errmsg-utf8.txt
+rm -f %{buildroot}/usr/share/mysql/magic
+rm -f %{buildroot}/usr/share/mysql/mysql-log-rotate
+rm -f %{buildroot}/usr/share/mysql/mysql*.server
rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
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
@@ -56,6 +61,19 @@
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,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files
+errmsg_list()
+{
+ echo '%%defattr(-, root, root)'
+ pushd %buildroot >/dev/null
+ for f in usr/share/%{name}/*; do
+ if test -e $f/errmsg.sys; then
+ echo "%%dir /$f"
+ fi
+ done
+ echo /usr/share/%{name}/errmsg-utf8.txt
+ popd >/dev/null
+}
+errmsg_list > errormessages.files
### files not installed by make install
# Create directory structure
DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini)
@@ -136,3 +154,15 @@
fi
mkdir -p '%buildroot'/etc/mysql
bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf -
+if [ -z "`ls '%buildroot'/usr/share/info/mysql.info*`" ]; then
+ install -D -m 0644 Docs/mysql.info "%buildroot/usr/share/info/mysql.info"
+ gzip -9 "%buildroot/usr/share/info/mysql.info"
+fi
+if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so`" ]; then
+ echo '%%dir %%_libdir/mysql' >> mysql-client.files
+ echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files
+ echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files
+fi
+rm -rf '%buildroot'/etc/my.cnf.d
+rm -rf '%buildroot'/usr/share/doc/%{name}-%{version}
+rm -rf '%buildroot'/usr/share/mysql/SELinux
++++++ mariadb-5.5.23.tar.bz2 -> mariadb-5.5.25.tar.bz2 ++++++
/work/SRC/openSUSE:12.2/mariadb/mariadb-5.5.23.tar.bz2 /work/SRC/openSUSE:12.2/.mariadb.new/mariadb-5.5.25.tar.bz2 differ: char 11, line 1
++++++ mysql-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.23-ppc64-libdir.patch new/mysql-patches/mysql-patches/mariadb-5.5.23-ppc64-libdir.patch
--- old/mysql-patches/mysql-patches/mariadb-5.5.23-ppc64-libdir.patch 2012-04-25 12:31:33.000000000 +0200
+++ new/mysql-patches/mysql-patches/mariadb-5.5.23-ppc64-libdir.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-PATCH-P0-FIX-SUSE: fix ppc64 libdir
-
-This patch fixes libdir on ppc64
-
-Maintainer: Dinar Valeev
-
-Index: cmake/install_layout.cmake
-===================================================================
---- cmake/install_layout.cmake.orig
-+++ cmake/install_layout.cmake
-@@ -138,7 +138,7 @@
- SET(INSTALL_SBINDIR_RPM "sbin")
- SET(INSTALL_SCRIPTDIR_RPM "bin")
- #
--IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" "OR" CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
- SET(INSTALL_LIBDIR_RPM "lib64")
- SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
- ELSE()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.24-ppc64-libdir.patch new/mysql-patches/mysql-patches/mariadb-5.5.24-ppc64-libdir.patch
--- old/mysql-patches/mysql-patches/mariadb-5.5.24-ppc64-libdir.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/mysql-patches/mysql-patches/mariadb-5.5.24-ppc64-libdir.patch 2012-06-19 15:12:58.000000000 +0200
@@ -0,0 +1,19 @@
+PATCH-P0-FIX-SUSE: fix ppc64 libdir
+
+This patch fixes libdir on ppc64
+
+Maintainer: Dinar Valeev
+
+Index: cmake/install_layout.cmake
+===================================================================
+--- cmake/install_layout.cmake.orig
++++ cmake/install_layout.cmake
+@@ -139,7 +139,7 @@ SET(INSTALL_SBINDIR_RPM
+ SET(INSTALL_SCRIPTDIR_RPM "bin")
+ SET(INSTALL_SYSCONFDIR_RPM "/etc")
+ #
+-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" "OR" CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
+ SET(INSTALL_LIBDIR_RPM "lib64")
+ SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
+ ELSE()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.25-mysqld_multi-features.patch new/mysql-patches/mysql-patches/mariadb-5.5.25-mysqld_multi-features.patch
--- old/mysql-patches/mysql-patches/mariadb-5.5.25-mysqld_multi-features.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/mysql-patches/mysql-patches/mariadb-5.5.25-mysqld_multi-features.patch 2012-06-23 09:58:31.000000000 +0200
@@ -0,0 +1,179 @@
+PATCH-P0-FEATURE-UPSTREAM: Add more functionality to mysqld_multi script
+
+Adds reload funcionality to mysqld_multi.sh perl script and adds --datadir
+support.
+
+Maintainer: Michal Hrusecky
+
+Index: scripts/mysqld_multi.sh
+===================================================================
+--- scripts/mysqld_multi.sh.orig
++++ scripts/mysqld_multi.sh
+@@ -36,6 +36,7 @@
+
+ use Getopt::Long;
+ use POSIX qw(strftime getcwd);
++use File::Path qw(mkpath);
+
+ $|=1;
+ $VER="2.16";
+@@ -139,6 +140,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)));
+
+ init_log() if (!defined($opt_log));
+@@ -153,7 +155,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)
+ {
+@@ -162,7 +164,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
+ {
+@@ -318,6 +324,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
+@@ -382,6 +421,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
+ ####
+
+@@ -744,7 +835,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
+@@ -762,16 +853,16 @@ integer starting from 1. These groups sh
+ [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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-mysqld_multi-features.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-mysqld_multi-features.patch
--- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-mysqld_multi-features.patch 2011-10-11 12:25:33.000000000 +0200
+++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-mysqld_multi-features.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,179 +0,0 @@
-PATCH-P0-FEATURE-UPSTREAM: Add more functionality to mysqld_multi script
-
-Adds reload funcionality to mysqld_multi.sh perl script and adds --datadir
-support.
-
-Maintainer: Michal Hrusecky
-
-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";
-@@ -125,6 +126,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)
-@@ -138,7 +140,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)
- {
-@@ -147,7 +149,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
- {
-@@ -303,6 +309,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
-@@ -367,6 +406,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
- ####
-
-@@ -729,7 +820,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
-@@ -747,16 +838,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:
++++++ series ++++++
--- /var/tmp/diff_new_pack.hw6tOJ/_old 2012-06-28 15:33:29.000000000 +0200
+++ /var/tmp/diff_new_pack.hw6tOJ/_new 2012-06-28 15:33:29.000000000 +0200
@@ -4,9 +4,9 @@
mariadb-5.1.50-strncat-overflow.patch
mariadb-5.2.6-install_db-quiet.patch
mysql-community-server-5.1.51-mysql_config.patch
-mysql-community-server-5.1.51-mysqld_multi-features.patch
+mariadb-5.5.25-mysqld_multi-features.patch
mariadb-5.1.50-upgrade-exit-status.patch
mariadb-5.2.3-cnf.patch
mysql-community-server-5.5.6-safe-process-in-bin.patch
mariadb-5.5.20-group.patch
-mariadb-5.5.23-ppc64-libdir.patch
+mariadb-5.5.24-ppc64-libdir.patch
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org