Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2013-09-23 10:02:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2013-08-21 15:08:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2013-09-23 10:02:36.000000000 +0200 @@ -1,0 +2,28 @@ +Thu Sep 19 08:03:20 UTC 2013 - mhruse...@suse.com + +- comment out old settings dir if it doesn't exist + +------------------------------------------------------------------- +Wed Sep 18 23:33:33 CEST 2013 - mhruse...@suse.cz + +- fixed commenting out of incompatible options +- updated to MariaDB 5.5.33 + * Release notes: + http://kb.askmonty.org/v/mariadb-5533-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-5533-changelog + * not using TokuDB and jmalloc + +------------------------------------------------------------------- +Mon Sep 9 10:37:12 CEST 2013 - mhruse...@suse.cz + +- better version detection +- drop /etc/mysql dir, use upstream /etc/my.cfn.d only + +------------------------------------------------------------------- +Thu Aug 22 03:04:45 UTC 2013 - crrodrig...@opensuse.org + +- Build with -DOPENSSL_LOAD_CONF so mariadb respects + and load the system's openSSL configuration. + +------------------------------------------------------------------- Old: ---- mariadb-5.5.32.tar.bz2 New: ---- mariadb-5.5.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.9fLBJ9/_old 2013-09-23 10:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.9fLBJ9/_new 2013-09-23 10:02:38.000000000 +0200 @@ -16,9 +16,10 @@ # # Few definitions which will alter build -%define prefered 1 -%define use_cmake 1 -%define cluster 0 +%define prefered 01 +%define use_cmake 01 +%define cluster 00 +%define have_info 0 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb %define use_extra_provides 1 %define extra_provides mariadb_55 @@ -34,9 +35,9 @@ Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers -Version: 5.5.32 +Version: 5.5.33 Release: 0 -%define srv_vers 5.5.32 +%define srv_vers 5.5.33 Url: http://www.mariab.org Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf @@ -54,6 +55,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils +%if %have_info +PreReq: %install_info_prereq %insserv_prereq +%endif %endif BuildRequires: autoconf BuildRequires: automake @@ -399,6 +403,8 @@ %endif # Broken test that needs sources rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result +# Present only in newer MariaDB, big change, needs fixing & testing +rm -rf storage/tokudb %build %{expand:%(cat %_sourcedir/build.inc)} @@ -445,6 +451,10 @@ end %posttrans +%if %have_info +[ -z "`ls %{_infodir}/mysql.info.* 2> /dev/null`" ] || \ +%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* +%endif if [ -d /var/lib/mysql ]; then touch /var/lib/mysql/.run-mysql_upgrade chown -R --no-dereference mysql:mysql /var/lib/mysql @@ -484,6 +494,9 @@ %postun if [ $1 = 0 ]; then + %if %have_info + %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.* + %endif %{insserv_cleanup} rm -f "/var/lib/systemd/migrated/mysql.service" if [ -x /usr/bin/systemctl ]; then @@ -502,6 +515,9 @@ %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf.d/* %config /etc/logrotate.d/mysql %doc %{_defaultdocdir}/%{name} +%if %have_info +%doc %{_infodir}/mysql.info.* +%endif /etc/init.d/mysql /usr/sbin/rcmysql %dir /usr/share/%{name} ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.9fLBJ9/_old 2013-09-23 10:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.9fLBJ9/_new 2013-09-23 10:02:38.000000000 +0200 @@ -9,7 +9,7 @@ %ifarch ppc64 export EXTRA_FLAGS=" -mminimal-toc " %endif -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS " +export CFLAGS="$RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS " export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" %if 0%{use_cmake} < 1 @@ -101,6 +101,7 @@ shift cmake -DWITH_SSL=system \ -DWITH_ZLIB=system \ + -DWITH_JEMALLOC=no \ -DWITH_READLINE=0 \ -DWITH_LIBEDIT=0 \ -DINSTALL_LAYOUT=RPM \ ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.9fLBJ9/_old 2013-09-23 10:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.9fLBJ9/_new 2013-09-23 10:02:38.000000000 +0200 @@ -88,6 +88,7 @@ install -m 644 "${i}" "${DOCDIR}" || true done install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql +sed -i 's|@MYSQLVER@|%{version}|' %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 @@ -145,11 +146,14 @@ rm -rf '%buildroot'/etc/my.cnf.d mkdir -p '%buildroot'/etc/my.cnf.d bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/my.cnf.d -xvf - +%if %have_info < 1 [ -z "`ls '%buildroot'/usr/share/info/mysql.info* 2> /dev/null`" ] || rm -f '%buildroot'/usr/share/info/mysql.info* +%endif if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; 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'/usr/share/doc/{mysql,mariadb}* +rm -f '%buildroot'/usr/share/doc/* 2> /dev/null || true rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux} ++++++ mariadb-5.5.32.tar.bz2 -> mariadb-5.5.33.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-5.5.32.tar.bz2 /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-5.5.33.tar.bz2 differ: char 11, line 1 ++++++ my.ini ++++++ --- /var/tmp/diff_new_pack.9fLBJ9/_old 2013-09-23 10:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.9fLBJ9/_new 2013-09-23 10:02:38.000000000 +0200 @@ -98,6 +98,5 @@ # socket = /var/lib/mysql-databases/mysqld6/mysql.sock # user = mysql -!includedir /etc/mysql !includedir /etc/my.cnf.d ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.32-deharcode-libdir.patch new/mysql-patches/mysql-patches/mariadb-5.5.32-deharcode-libdir.patch --- old/mysql-patches/mysql-patches/mariadb-5.5.32-deharcode-libdir.patch 2013-08-14 09:05:39.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.5.32-deharcode-libdir.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -PATCH-P0-FIX-SUSE: dehardcode libdir - -Don't expect libdir is set to lib64 on x86_64 only. -There is other occurances like ppc64 and aarch64. -Use %{_libdir} macro instead - -Maintainer: Dinar Valeev <dval...@suse.com> - -Index: cmake/install_layout.cmake -=================================================================== ---- cmake/install_layout.cmake.orig -+++ cmake/install_layout.cmake -@@ -146,14 +146,6 @@ SET(INSTALL_SBINDIR_RPM - SET(INSTALL_SCRIPTDIR_RPM "bin") - SET(INSTALL_SYSCONFDIR_RPM "/etc") - # --IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") -- SET(INSTALL_LIBDIR_RPM "lib64") -- SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin") --ELSE() -- SET(INSTALL_LIBDIR_RPM "lib") -- SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin") --ENDIF() --# - SET(INSTALL_INCLUDEDIR_RPM "include/mysql") - # - SET(INSTALL_DOCDIR_RPM "share/doc/${CPACK_SOURCE_PACKAGE_FILE_NAME}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.33-deharcode-libdir.patch new/mysql-patches/mysql-patches/mariadb-5.5.33-deharcode-libdir.patch --- old/mysql-patches/mysql-patches/mariadb-5.5.33-deharcode-libdir.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.5.33-deharcode-libdir.patch 2013-09-18 10:38:32.000000000 +0200 @@ -0,0 +1,27 @@ +PATCH-P0-FIX-SUSE: dehardcode libdir + +Don't expect libdir is set to lib64 on x86_64 only. +There is other occurances like ppc64 and aarch64. +Use %{_libdir} macro instead + +Maintainer: Dinar Valeev <dval...@suse.com> + +Index: cmake/install_layout.cmake +=================================================================== +--- cmake/install_layout.cmake.orig ++++ cmake/install_layout.cmake +@@ -148,14 +148,6 @@ SET(INSTALL_SCRIPTDIR_RPM + SET(INSTALL_SYSCONFDIR_RPM "/etc") + SET(INSTALL_SYSCONF2DIR_RPM "/etc/my.cnf.d") + # +-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") +- SET(INSTALL_LIBDIR_RPM "lib64") +- SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin") +-ELSE() +- SET(INSTALL_LIBDIR_RPM "lib") +- SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin") +-ENDIF() +-# + SET(INSTALL_INCLUDEDIR_RPM "include/mysql") + # + SET(INSTALL_DOCDIR_RPM "share/doc") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-5.5-dump.patch new/mysql-patches/mysql-patches/mysql-5.5-dump.patch --- old/mysql-patches/mysql-patches/mysql-5.5-dump.patch 2013-08-14 09:05:39.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-5.5-dump.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -PATCH-P1-FIX-UPSTREAM: Fix mysql dump - -In mysql-5.0.x tables `general_log` and `slow_log` don't have to exist. -When we try to get dump of mysql database of mysql-5.0.x server using -client mysql-5.1.x or newer, which expect these tables to exist, mysqldump -will crash with the following error: - - mysqldump: Couldn't execute 'show create table `general_log`': Table - 'mysql.general_log' doesn't exist (1146) - -This is reported at http://bugs.mysql.com/bug.php?id=65670 - -This patch adds checking if tables `general_log` and `slow_log` exist before -reading their structure. - -diff -up mysql-5.1.66/client/mysqldump.c.logs mysql-5.1.66/client/mysqldump.c ---- mysql-5.1.66/client/mysqldump.c.logs 2012-09-07 16:14:06.000000000 +0200 -+++ mysql-5.1.66/client/mysqldump.c 2012-11-28 15:33:00.116328380 +0100 -@@ -4269,6 +4269,31 @@ my_bool include_table(const uchar *hash_ - } - - -+/* Return 1 if table exists in db */ -+ -+static my_bool get_table_exists(char *table, char *db) -+{ -+ char query_buff[QUERY_LENGTH]; -+ MYSQL_RES *result; -+ MYSQL_ROW row; -+ my_bool return_value = 0; -+ -+ DBUG_ENTER("get_table_exists"); -+ my_snprintf(query_buff, sizeof(query_buff), -+ "SELECT COUNT(0) AS `Exists` " -+ "FROM `INFORMATION_SCHEMA`.`TABLES` WHERE " -+ "TABLE_SCHEMA = '%s' AND TABLE_NAME = '%s'", -+ db, table); -+ -+ mysql_query_with_error_report(mysql, &result, query_buff); -+ if (row= mysql_fetch_row(result)) -+ return_value = (strcmp(row[0], "0") != 0); -+ -+ mysql_free_result(result); -+ DBUG_RETURN(return_value); -+} -+ -+ - static int dump_all_tables_in_db(char *database) - { - char *table; -@@ -4292,17 +4317,24 @@ static int dump_all_tables_in_db(char *d - char table_type[NAME_LEN]; - char ignore_flag; - uint num_fields; -- num_fields= get_table_structure((char *) "general_log", -- database, table_type, &ignore_flag); -- if (num_fields == 0) -- verbose_msg("-- Warning: get_table_structure() failed with some internal " -- "error for 'general_log' table\n"); -- num_fields= get_table_structure((char *) "slow_log", -- database, table_type, &ignore_flag); -- if (num_fields == 0) -- verbose_msg("-- Warning: get_table_structure() failed with some internal " -- "error for 'slow_log' table\n"); -+ if (get_table_exists((char *) "general_log", database)) -+ { -+ num_fields= get_table_structure((char *) "general_log", -+ database, table_type, &ignore_flag); -+ if (num_fields == 0) -+ verbose_msg("-- Warning: get_table_structure() failed with some internal " -+ "error for 'general_log' table\n"); -+ } -+ if (get_table_exists((char *) "slow_log", database)) -+ { -+ num_fields= get_table_structure((char *) "slow_log", -+ database, table_type, &ignore_flag); -+ if (num_fields == 0) -+ verbose_msg("-- Warning: get_table_structure() failed with some internal " -+ "error for 'slow_log' table\n"); -+ } - } -+ - if (lock_tables) - { - DYNAMIC_STRING query; ++++++ rc.mysql-multi ++++++ --- /var/tmp/diff_new_pack.9fLBJ9/_old 2013-09-23 10:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.9fLBJ9/_new 2013-09-23 10:02:38.000000000 +0200 @@ -334,7 +334,7 @@ chown -R --no-dereference mysql:mysql "$log_dir" done - MYSQLVER="`mysqld --version | sed 's|.*Ver\ *\([^\ ]*\)\.[0-9]\+[\-\ ].*|\1|'`" + MYSQLVER="`echo @MYSQLVER@ | sed 's|\.[0-9]\+$||'`" # We assume a fresh install if the directory $datadir/mysql # does not exist and create the privilege database @@ -351,6 +351,7 @@ # user confirmation. if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \ + [ -f "$datadir/mysql_upgrade_info" ] && \ [ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then echo echo "You are upgrading from different stable version of MySQL!" @@ -369,8 +370,10 @@ echo >> "$log_upgrade" echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade" echo " /usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade" - sed -i -e 's|^\([^#]*skip-locking\)|\1\nskip-external-locking|' \ - -e 's|^\([^#]*skip-federated\)|#\1|' /etc/my.cnf + sed -i -e 's|^\([[:blank:]]*\)skip-locking|\1skip-external-locking|' \ + -e 's|^\([[:blank:]]*skip-federated\)|#\1|' /etc/my.cnf + [ -d /etc/mysql ] || \ + sed -i 's|^\([[:blank:]]*!includedir\ /etc/mysql[[:blank:]]*\)$|#\1|' /etc/my.cnf # Check logs for inconsistencies SRCLOGS="" ALL_SRCLOGS="" @@ -483,6 +486,8 @@ chmod 750 "$datadir" chown -R --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$datadir" rm -f /var/adm/update-messages/mysql-* + [ "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ] || \ + echo -n "@MYSQLVER@" > "$datadir/mysql_upgrade_info" rm -f /var/lib/mysql/.run-mysql_upgrade rm -f /var/lib/mysql/.force_upgrade rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past ++++++ series ++++++ --- /var/tmp/diff_new_pack.9fLBJ9/_old 2013-09-23 10:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.9fLBJ9/_new 2013-09-23 10:02:38.000000000 +0200 @@ -9,6 +9,5 @@ mariadb-5.2.3-cnf.patch mysql-community-server-5.5.6-safe-process-in-bin.patch mariadb-5.5.28-group.patch -mariadb-5.5.32-deharcode-libdir.patch +mariadb-5.5.33-deharcode-libdir.patch mysql-5.5.31-upgrade-datadir.patch -mysql-5.5-dump.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
