Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2014-10-15 16:19:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-05 20:29:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2014-10-15 16:19:52.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 9 16:58:53 UTC 2014 - michal.hruse...@opensuse.org + +- update to 10.0.14 + * Release notes: + http://kb.askmonty.org/v/mariadb-10014-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-10014-changelog +- fix build thanks to pull request from Andreas Schwab + +------------------------------------------------------------------- Old: ---- mariadb-10.0.13.tar.bz2 New: ---- mariadb-10.0.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.XT5PB6/_old 2014-10-15 16:19:54.000000000 +0200 +++ /var/tmp/diff_new_pack.XT5PB6/_new 2014-10-15 16:19:54.000000000 +0200 @@ -40,9 +40,9 @@ Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers -Version: 10.0.13 +Version: 10.0.14 Release: 0 -%define srv_vers 5.6.19 +%define srv_vers 5.6.20 Url: https://www.mariadb.org Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ mariadb-10.0.13.tar.bz2 -> mariadb-10.0.14.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-10.0.13.tar.bz2 /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-10.0.14.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-10.0.13-default-source.patch new/mysql-patches/mysql-patches/mariadb-10.0.13-default-source.patch --- old/mysql-patches/mysql-patches/mariadb-10.0.13-default-source.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.0.13-default-source.patch 2014-10-08 14:47:51.000000000 +0200 @@ -0,0 +1,14 @@ +PATCH-P1-FIX-UPSTREAM: define _DEFAULT_SOURCE to avoid warning about _SVID_SOURCE + +Index: mariadb-10.0.13/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake +=================================================================== +--- mariadb-10.0.13.orig/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake ++++ mariadb-10.0.13/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake +@@ -17,6 +17,7 @@ add_c_defines( + if (NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + ## on FreeBSD these types of macros actually remove functionality + add_c_defines( ++ _DEFAULT_SOURCE + _SVID_SOURCE + _XOPEN_SOURCE=600 + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.0.13-upgrade-datadir.patch new/mysql-patches/mysql-patches/mariadb-10.0.13-upgrade-datadir.patch --- old/mysql-patches/mysql-patches/mariadb-10.0.13-upgrade-datadir.patch 2014-08-19 08:08:50.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-10.0.13-upgrade-datadir.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,100 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Keep datadir across multiple calls - -mysql_upgrade script asks for datadir multiple times during update but at some -point privileges gets updated and if --skip-grant-tables was used (like in SUSE -init scripts), datadir is no longer queryable. So we cache the value. - -Maintainer: Michal Hrusecky <michal.hruse...@opensuse.org> - -Index: client/mysql_upgrade.c -=================================================================== ---- client/mysql_upgrade.c.orig -+++ client/mysql_upgrade.c -@@ -608,21 +608,37 @@ static int extract_variable_from_show(DY - - static int get_upgrade_info_file_name(char* name) - { -- DYNAMIC_STRING ds_datadir; -- DBUG_ENTER("get_upgrade_info_file_name"); -+ static char *data_dir = NULL; -+ static size_t len; - -- if (init_dynamic_string(&ds_datadir, NULL, 32, 32)) -- die("Out of memory"); -+ DBUG_ENTER("get_upgrade_info_file_name"); - -- if (run_query("show variables like 'datadir'", -- &ds_datadir, FALSE) || -- extract_variable_from_show(&ds_datadir, name)) -+ if(data_dir==NULL) - { -+ DYNAMIC_STRING ds_datadir; -+ -+ if (init_dynamic_string(&ds_datadir, NULL, 32, 32)) -+ die("Out of memory"); -+ -+ if (run_query("show variables like 'datadir'", -+ &ds_datadir, FALSE) || -+ extract_variable_from_show(&ds_datadir, name) -+ ) -+ { -+ dynstr_free(&ds_datadir); -+ DBUG_RETURN(1); /* Query failed */ -+ } - dynstr_free(&ds_datadir); -- DBUG_RETURN(1); /* Query failed */ -- } -+ len = strlen(name)+1; -+ if ((data_dir=(char*)malloc(sizeof(char)*len))==NULL) -+ { -+ die("Out of memory"); -+ } -+ strncpy(data_dir,name,len); - -- dynstr_free(&ds_datadir); -+ } else { -+ strncpy(name, data_dir, len); -+ } - - fn_format(name, "mysql_upgrade_info", name, "", MYF(0)); - DBUG_PRINT("exit", ("name: %s", name)); -@@ -757,7 +773,7 @@ static int run_mysqlcheck_upgrade(const - - static int run_mysqlcheck_fixnames(void) - { -- verbose("Phase 2/3: Fixing table and database names"); -+ verbose("Phase 2/4: Fixing table and database names"); - print_conn_args("mysqlcheck"); - return run_tool(mysqlcheck_path, - NULL, /* Send output from mysqlcheck directly to screen */ -@@ -1000,7 +1016,7 @@ int main(int argc, char **argv) - Read the mysql_upgrade_info file to check if mysql_upgrade - already has been run for this installation of MySQL - */ -- if (!opt_force && upgrade_already_done()) -+ if (upgrade_already_done() && !opt_force) - { - printf("This installation of MySQL is already upgraded to %s, " - "use --force if you still need to run mysql_upgrade\n", -@@ -1016,15 +1032,17 @@ int main(int argc, char **argv) - /* - Run "mysqlcheck" and "mysql_fix_privilege_tables.sql" - */ -- verbose("Phase 1/3: Running 'mysql_fix_privilege_tables'..."); -- if (run_mysqlcheck_upgrade("--databases", "mysql") || -- run_sql_fix_privilege_tables()) -+ verbose("Phase 1/4: Checking and upgrading mysql tables"); -+ if (run_mysqlcheck_upgrade("--databases", "mysql")) - die("Upgrade failed" ); - if (!opt_systables_only && - (run_mysqlcheck_fixnames() || -- verbose("Phase 3/3: Checking and upgrading tables") || -+ verbose("Phase 3/4: Checking and upgrading tables") || - run_mysqlcheck_upgrade("--all-databases","--skip-database=mysql"))) - die("Upgrade failed" ); -+ verbose("Phase 4/4: Running 'mysql_fix_privilege_tables'..."); -+ if (run_sql_fix_privilege_tables()) -+ die("Upgrade failed" ); - - verbose("OK"); - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.0.14-upgrade-datadir.patch new/mysql-patches/mysql-patches/mariadb-10.0.14-upgrade-datadir.patch --- old/mysql-patches/mysql-patches/mariadb-10.0.14-upgrade-datadir.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.0.14-upgrade-datadir.patch 2014-10-09 08:34:39.000000000 +0200 @@ -0,0 +1,90 @@ +PATCH-P0-FEATURE-UPSTREAM: Keep datadir across multiple calls + +mysql_upgrade script asks for datadir multiple times during update but at some +point privileges gets updated and if --skip-grant-tables was used (like in SUSE +init scripts), datadir is no longer queryable. So we cache the value. + +Maintainer: Michal Hrusecky <michal.hruse...@opensuse.org> + +Index: client/mysql_upgrade.c +=================================================================== +--- client/mysql_upgrade.c.orig ++++ client/mysql_upgrade.c +@@ -611,21 +611,37 @@ static int extract_variable_from_show(DY + + static int get_upgrade_info_file_name(char* name) + { +- DYNAMIC_STRING ds_datadir; +- DBUG_ENTER("get_upgrade_info_file_name"); ++ static char *data_dir = NULL; ++ static size_t len; + +- if (init_dynamic_string(&ds_datadir, NULL, 32, 32)) +- die("Out of memory"); ++ DBUG_ENTER("get_upgrade_info_file_name"); + +- if (run_query("show variables like 'datadir'", +- &ds_datadir, FALSE) || +- extract_variable_from_show(&ds_datadir, name)) ++ if(data_dir==NULL) + { ++ DYNAMIC_STRING ds_datadir; ++ ++ if (init_dynamic_string(&ds_datadir, NULL, 32, 32)) ++ die("Out of memory"); ++ ++ if (run_query("show variables like 'datadir'", ++ &ds_datadir, FALSE) || ++ extract_variable_from_show(&ds_datadir, name) ++ ) ++ { ++ dynstr_free(&ds_datadir); ++ DBUG_RETURN(1); /* Query failed */ ++ } + dynstr_free(&ds_datadir); +- DBUG_RETURN(1); /* Query failed */ +- } ++ len = strlen(name)+1; ++ if ((data_dir=(char*)malloc(sizeof(char)*len))==NULL) ++ { ++ die("Out of memory"); ++ } ++ strncpy(data_dir,name,len); + +- dynstr_free(&ds_datadir); ++ } else { ++ strncpy(name, data_dir, len); ++ } + + fn_format(name, "mysql_upgrade_info", name, "", MYF(0)); + DBUG_PRINT("exit", ("name: %s", name)); +@@ -1007,7 +1023,7 @@ int main(int argc, char **argv) + Read the mysql_upgrade_info file to check if mysql_upgrade + already has been run for this installation of MySQL + */ +- if (!opt_force && upgrade_already_done()) ++ if (upgrade_already_done() && !opt_force) + { + printf("This installation of MySQL is already upgraded to %s, " + "use --force if you still need to run mysql_upgrade\n", +@@ -1026,9 +1042,6 @@ int main(int argc, char **argv) + verbose("Phase 1/4: Checking mysql database"); + if (run_mysqlcheck_upgrade("--databases", "mysql")) + die("Upgrade failed" ); +- verbose("Phase 2/4: Running 'mysql_fix_privilege_tables'..."); +- if (run_sql_fix_privilege_tables()) +- die("Upgrade failed" ); + + if (!opt_systables_only && + (run_mysqlcheck_fixnames() || +@@ -1036,6 +1049,10 @@ int main(int argc, char **argv) + run_mysqlcheck_upgrade("--all-databases","--skip-database=mysql"))) + die("Upgrade failed" ); + ++ verbose("Phase 2/4: Running 'mysql_fix_privilege_tables'..."); ++ if (run_sql_fix_privilege_tables()) ++ die("Upgrade failed" ); ++ + verbose("OK"); + + /* Create a file indicating upgrade has been performed */ ++++++ series ++++++ --- /var/tmp/diff_new_pack.XT5PB6/_old 2014-10-15 16:19:55.000000000 +0200 +++ /var/tmp/diff_new_pack.XT5PB6/_new 2014-10-15 16:19:55.000000000 +0200 @@ -10,7 +10,8 @@ mysql-community-server-5.5.6-safe-process-in-bin.patch mariadb-10.0.11-group.patch mariadb-10.0.5-deharcode-libdir.patch -mariadb-10.0.13-upgrade-datadir.patch +mariadb-10.0.14-upgrade-datadir.patch mysql-community-server-5.6.12-srv_buf_size.patch mariadb-10.0.9-perl-in-bench.patch mariadb-10.0.11-header_files_const_warnings.patch +mariadb-10.0.13-default-source.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
