Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2012-11-12 07:04:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2012-10-06 18:39:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2012-11-12 07:04:08.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Oct 31 22:31:34 CET 2012 - mhruse...@suse.cz + +- updated to MariaDB 5.5.28 + * Release notes: + http://kb.askmonty.org/v/mariadb-5527-release-notes + http://kb.askmonty.org/v/mariadb-5528-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-5527-changelog + http://kb.askmonty.org/v/mariadb-5528-changelog + +------------------------------------------------------------------- Old: ---- mariadb-5.5.25.tar.bz2 New: ---- mariadb-5.5.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.iGX3DF/_old 2012-11-12 07:04:10.000000000 +0100 +++ /var/tmp/diff_new_pack.iGX3DF/_new 2012-11-12 07:04:10.000000000 +0100 @@ -35,9 +35,9 @@ Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers -Version: 5.5.25 -Release: 0 -%define srv_vers 5.5.25 +Version: 5.5.28 +Release: 1 +%define srv_vers 5.5.28 Url: http://www.mariab.org Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf @@ -83,11 +83,10 @@ Requires: logrotate %endif # required by rcmysql -Requires: %{name}-client +Requires: %{name}-client perl-base Requires: %{name}-errormessages = %version -Requires: perl-base -Provides: mysql = %{srv_vers} Provides: mysql-Max = %{srv_vers} +Provides: mysql = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides} = %{version} Obsoletes: %{extra_provides} < %{version} @@ -111,12 +110,13 @@ # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release Obsoletes: mysql-devel < %srv_vers -Requires: glibc-devel Requires: libmysqlclient18 = %version Requires: libmysqlclient_r18 = %version +Requires: glibc-devel Requires: openssl-devel Requires: zlib-devel Summary: MariaDB development header files and libraries +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/C and C++ %description -n libmysqlclient-devel @@ -124,6 +124,7 @@ necessary to develop client applications for MariaDB. %package -n libmysqld18 +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ @@ -132,12 +133,13 @@ for developing applications that embed the MariaDB. %package -n libmysqld-devel +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files -Group: Development/Libraries/C and C++ # the headers files are the shared Requires: libmysqlclient-devel = %version -Requires: libmysqld18 = %version Requires: tcpd-devel +Requires: libmysqld18 = %version +Group: Development/Libraries/C and C++ %description -n libmysqld-devel This package contains the development header files and libraries @@ -146,6 +148,7 @@ %package -n libmariadbclient18 Summary: Shared Libraries for MariaDB +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmariadbclient18 @@ -154,6 +157,7 @@ %package -n libmariadbclient_r18 Summary: Shared Libraries for MariaDB +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmariadbclient_r18 @@ -186,8 +190,7 @@ server daemon as well as the embedded server %package bench -Requires: %{name}-client -Requires: perl-DBD-mysql +Requires: %{name}-client perl-DBD-mysql Summary: Benchmarks for MariaDB Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} @@ -211,8 +214,8 @@ Summary: MariaDB with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{version} -Provides: %{name}-debug = %{srv_vers} Provides: mysql-debug = %{srv_vers} +Provides: %{name}-debug = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-debug-verion = %{version} Obsoletes: %{extra_provides}-debug-version < %{version} @@ -233,10 +236,10 @@ Summary: Testsuite for MariaDB Group: Productivity/Databases/Servers Requires: %{name} = %{version} -Requires: %{name}-bench = %{version} Requires: %{name}-client = %{version} -Requires: %{name}-tools = %{version} Requires: perl-DBD-mysql +Requires: %{name}-tools = %{version} +Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-test = %{version} ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ mariadb-5.5.25.tar.bz2 -> mariadb-5.5.28.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-5.5.25.tar.bz2 /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-5.5.28.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.2.6-install_db-quiet.patch new/mysql-patches/mysql-patches/mariadb-5.2.6-install_db-quiet.patch --- old/mysql-patches/mysql-patches/mariadb-5.2.6-install_db-quiet.patch 2012-06-02 20:28:21.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.2.6-install_db-quiet.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Use better comments in install_db - -We ship init script so we don't need to warn user to install one and we also -have a testsuite in separate packege. - -Maintainer: Michal Hrusecky <michal.hruse...@opensuse.org> - -Index: scripts/mysql_install_db.sh -=================================================================== ---- scripts/mysql_install_db.sh.orig -+++ scripts/mysql_install_db.sh -@@ -466,9 +466,10 @@ 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" -+# Output disabled, since the SUSE RPM comes with an init script installed -+# 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 !" -@@ -490,10 +491,9 @@ then - then - echo - echo "You can start the MariaDB daemon with:" -- echo "cd $basedir ; $bindir/mysqld_safe --datadir=$ldata" -+ 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" - fi - - echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch new/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch --- old/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch 2012-06-02 20:28:21.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,148 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Adds group option - -This patch let's you specify not only user to use but also group that MySQL -should use. - -Maintainer: Michal Hrusecky <mhruse...@suse.cz> - -Index: scripts/mysqld_safe.sh -=================================================================== ---- scripts/mysqld_safe.sh.orig -+++ scripts/mysqld_safe.sh -@@ -23,6 +23,7 @@ logging=init - want_syslog=0 - syslog_tag= - user='@MYSQLD_USER@' -+group='@MYSQLD_GROUP@' - pid_file= - err_log= - -@@ -176,6 +177,7 @@ parse_arguments() { - --pid-file=*) pid_file="$val" ;; - --plugin-dir=*) PLUGIN_DIR="$val" ;; - --user=*) user="$val"; SET_USER=1 ;; -+ --group=*) group="$val"; SET_USER=1 ;; - --log-basename=*|--hostname=*|--loose-log-basename=*) - pid_file="$val.pid"; - err_log="$val.err"; -@@ -567,11 +569,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 -@@ -594,7 +602,12 @@ then - echo "Fatal error Can't create database directory '$mysql_unix_port'" - exit 1 - fi -- 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 -@@ -30,6 +30,7 @@ args="" - defaults="" - mysqld_opt="" - user="" -+group="" - - force=0 - in_rpm=0 -@@ -72,6 +73,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 - -@@ -119,11 +125,11 @@ parse_arguments() - --builddir=*) builddir=`parse_arg "$arg"` ;; - --srcdir=*) srcdir=`parse_arg "$arg"` ;; - --ldata=*|--datadir=*|--data=*) 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 ;; -@@ -383,7 +389,12 @@ do - fi - if test -n "$user" - then -- chown $user $dir -+ if test -z "$group" -+ then -+ chown $user $dir -+ else -+ chown $user:$group $dir -+ fi - if test $? -ne 0 - then - echo "Cannot change ownership of the database directories to the '$user'" -@@ -398,6 +409,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. -Index: scripts/CMakeLists.txt -=================================================================== ---- scripts/CMakeLists.txt.orig -+++ scripts/CMakeLists.txt -@@ -137,6 +137,7 @@ ENDIF() - - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") -+SET(MYSQLD_GROUP "mysql") - - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables -Index: support-files/CMakeLists.txt -=================================================================== ---- support-files/CMakeLists.txt.orig -+++ support-files/CMakeLists.txt -@@ -28,6 +28,7 @@ ELSE() - SET(CFLAGS ${CMAKE_C_FLAGS}) - SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) - SET(MYSQLD_USER "mysql") -+ SET(MYSQLD_GROUP "mysql") - SET(ini_file_extension "cnf") - SET(HOSTNAME "hostname") - ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.28-group.patch new/mysql-patches/mysql-patches/mariadb-5.5.28-group.patch --- old/mysql-patches/mysql-patches/mariadb-5.5.28-group.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.5.28-group.patch 2012-10-31 09:16:07.000000000 +0100 @@ -0,0 +1,148 @@ +PATCH-P0-FEATURE-UPSTREAM: Adds group option + +This patch let's you specify not only user to use but also group that MySQL +should use. + +Maintainer: Michal Hrusecky <mhruse...@suse.cz> + +Index: scripts/mysqld_safe.sh +=================================================================== +--- scripts/mysqld_safe.sh.orig ++++ scripts/mysqld_safe.sh +@@ -24,6 +24,7 @@ logging=init + want_syslog=0 + syslog_tag= + user='@MYSQLD_USER@' ++group='@MYSQLD_GROUP@' + pid_file= + err_log= + +@@ -187,6 +188,7 @@ parse_arguments() { + --pid-file=*) pid_file="$val" ;; + --plugin-dir=*) PLUGIN_DIR="$val" ;; + --user=*) user="$val"; SET_USER=1 ;; ++ --group=*) group="$val"; SET_USER=1 ;; + --log-basename=*|--hostname=*|--loose-log-basename=*) + pid_file="$val.pid"; + err_log="$val.err"; +@@ -579,11 +581,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 +@@ -606,7 +614,12 @@ then + echo "Fatal error Can't create database directory '$mysql_unix_port'" + exit 1 + fi +- 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 +@@ -29,6 +29,7 @@ args="" + defaults="" + mysqld_opt="" + user="" ++group="" + + force=0 + in_rpm=0 +@@ -71,6 +72,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 + +@@ -118,11 +124,11 @@ parse_arguments() + --builddir=*) builddir=`parse_arg "$arg"` ;; + --srcdir=*) srcdir=`parse_arg "$arg"` ;; + --ldata=*|--datadir=*|--data=*) 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 ;; +@@ -385,7 +391,12 @@ do + fi + if test -n "$user" + then +- chown $user "$dir" ++ if test -z "$group" ++ then ++ chown $user $dir ++ else ++ chown $user:$group $dir ++ fi + if test $? -ne 0 + then + echo "Cannot change ownership of the database directories to the '$user'" +@@ -400,6 +411,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. +Index: scripts/CMakeLists.txt +=================================================================== +--- scripts/CMakeLists.txt.orig ++++ scripts/CMakeLists.txt +@@ -137,6 +137,7 @@ ENDIF() + + SET(HOSTNAME "hostname") + SET(MYSQLD_USER "mysql") ++SET(MYSQLD_GROUP "mysql") + + # Required for mysqlbug until autotools are deprecated, once done remove these + # and expand default cmake variables +Index: support-files/CMakeLists.txt +=================================================================== +--- support-files/CMakeLists.txt.orig ++++ support-files/CMakeLists.txt +@@ -29,6 +29,7 @@ ELSE() + SET(CFLAGS ${CMAKE_C_FLAGS}) + SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) + SET(MYSQLD_USER "mysql") ++ SET(MYSQLD_GROUP "mysql") + SET(ini_file_extension "cnf") + SET(HOSTNAME "hostname") + ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.28-hotcopy.patch new/mysql-patches/mysql-patches/mariadb-5.5.28-hotcopy.patch --- old/mysql-patches/mysql-patches/mariadb-5.5.28-hotcopy.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.5.28-hotcopy.patch 2012-10-31 08:30:45.000000000 +0100 @@ -0,0 +1,38 @@ +PATCH-P0-FIX-UPSTREAM: Makes hotcopy to ignores log tables +BUGS: upstream#43594, bnc#525325 + +If you are running hotcopy, you probably want to ignore all +log tables. + +Maintainer: Michal Hrusecky <michal.hruse...@opensuse.org> + +Index: scripts/mysqlhotcopy.sh +=================================================================== +--- scripts/mysqlhotcopy.sh.orig ++++ scripts/mysqlhotcopy.sh +@@ -843,7 +843,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 get_list_of_views { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.28-install_db-quiet.patch new/mysql-patches/mysql-patches/mariadb-5.5.28-install_db-quiet.patch --- old/mysql-patches/mysql-patches/mariadb-5.5.28-install_db-quiet.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.5.28-install_db-quiet.patch 2012-10-31 08:51:14.000000000 +0100 @@ -0,0 +1,38 @@ +PATCH-P0-FEATURE-SUSE: Use better comments in install_db + +We ship init script so we don't need to warn user to install one and we also +have a testsuite in separate packege. + +Maintainer: Michal Hrusecky <michal.hruse...@opensuse.org> + +Index: scripts/mysql_install_db.sh +=================================================================== +--- scripts/mysql_install_db.sh.orig ++++ scripts/mysql_install_db.sh +@@ -473,9 +473,10 @@ 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" ++# Output disabled, since the SUSE RPM comes with an init script installed ++# 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 !" +@@ -498,10 +499,9 @@ then + then + echo + echo "You can start the MariaDB daemon with:" +- echo "cd '$basedir' ; $bindir/mysqld_safe --datadir='$ldata'" ++ 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" + fi + + echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-hotcopy.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-hotcopy.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-hotcopy.patch 2012-06-02 20:28:21.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-hotcopy.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Makes hotcopy to ignores log tables -BUGS: upstream#43594, bnc#525325 - -If you are running hotcopy, you probably want to ignore all -log tables. - -Maintainer: Michal Hrusecky <michal.hruse...@opensuse.org> - -=== 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 { - ++++++ series ++++++ --- /var/tmp/diff_new_pack.iGX3DF/_old 2012-11-12 07:04:10.000000000 +0100 +++ /var/tmp/diff_new_pack.iGX3DF/_new 2012-11-12 07:04:10.000000000 +0100 @@ -1,12 +1,12 @@ -mysql-community-server-5.1.36-hotcopy.patch +mariadb-5.5.28-hotcopy.patch mysql-community-server-5.1.45-multi-configuration.patch mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch -mariadb-5.2.6-install_db-quiet.patch +mariadb-5.5.28-install_db-quiet.patch mysql-community-server-5.1.51-mysql_config.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.28-group.patch mariadb-5.5.24-ppc64-libdir.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
