Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2015-12-06 07:28:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-09-13 09:42:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2015-12-06 07:28:48.000000000 +0100 @@ -1,0 +2,21 @@ +Mon Nov 30 11:38:12 UTC 2015 - [email protected] + +- update to 10.0.22 + * Release notes: + https://kb.askmonty.org/en/mariadb-10022-release-notes/ + * Changelog: + https://kb.askmonty.org/en/mariadb-10022-changelog/ + * fixed CVEs: + CVE-2015-4802, CVE-2015-4807, CVE-2015-4815, CVE-2015-4826 + CVE-2015-4830, CVE-2015-4836, CVE-2015-4858, CVE-2015-4861 + CVE-2015-4870, CVE-2015-4913, CVE-2015-4792 + * remove the following patches (applied upstream) + * mysql-community-server-5.6.12-srv_buf_size.patch + * mariadb-10.0.16-header_files_const_warnings.patch +- add mariadb-10.0.21-mysql-test_main_bootstrap.patch that fix + main.bootstrap test (change default charset to utf8 in test + result) [bnc#937787] +- add mariadb-10.0.22-fix_build_denabled_profiling_off.patch to + fix compilation with '-DENABLED_PROFILING=OFF' + +------------------------------------------------------------------- Old: ---- mariadb-10.0.21.tar.gz New: ---- mariadb-10.0.22.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.Fp9v3R/_old 2015-12-06 07:28:52.000000000 +0100 +++ /var/tmp/diff_new_pack.Fp9v3R/_new 2015-12-06 07:28:52.000000000 +0100 @@ -44,7 +44,7 @@ %define with_cassandra 0 %endif Name: mariadb -Version: 10.0.21 +Version: 10.0.22 Release: 0 Summary: Server part of %{pretty_name} License: SUSE-GPL-2.0-with-FLOSS-exception @@ -127,8 +127,8 @@ Obsoletes: %{extra_provides}-debug-version < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} -# On mariadb we want readline5 and on mysql we use libedit from system -%if "%{name}" == "mariadb" +# On mariadb we want readline5 (except for SLE12) and on mysql we use libedit from system +%if ("%{name}" == "mariadb" ) && ! (( 0%{?suse_version} == 1315 ) && ( ! 0%{?is_opensuse} )) BuildRequires: readline5-devel %else BuildRequires: libedit-devel ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ mariadb-10.0.21.tar.gz -> mariadb-10.0.22.tar.gz ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-10.0.21.tar.gz /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-10.0.22.tar.gz differ: char 5, line 1 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.0.16-header_files_const_warnings.patch new/mysql-patches/mysql-patches/mariadb-10.0.16-header_files_const_warnings.patch --- old/mysql-patches/mysql-patches/mariadb-10.0.16-header_files_const_warnings.patch 2015-06-16 13:03:35.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-10.0.16-header_files_const_warnings.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,114 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Fix unclean prototype declarations -BUGS: bnc#860137 - -Maintainer: Roman Drahtmueller <[email protected]> - - -Index: include/my_dbug.h -=================================================================== ---- include/my_dbug.h.orig -+++ include/my_dbug.h -@@ -58,7 +58,7 @@ extern void _db_end_(void); - extern void _db_lock_file_(void); - extern void _db_unlock_file_(void); - extern FILE *_db_fp_(void); --extern void _db_flush_(); -+extern void _db_flush_(void); - extern void dbug_swap_code_state(void **code_state_store); - extern void dbug_free_code_state(void **code_state_store); - extern const char* _db_get_func_(void); -@@ -123,7 +123,7 @@ extern const char* _db_get_func_(void); - #ifdef __WIN__ - #define DBUG_SUICIDE() DBUG_ABORT() - #else --extern void _db_suicide_(); -+extern void _db_suicide_(void); - #define DBUG_SUICIDE() (_db_flush_(), _db_suicide_()) - #endif - -Index: include/my_global.h -=================================================================== ---- include/my_global.h.orig -+++ include/my_global.h -@@ -555,7 +555,7 @@ typedef int my_socket; /* File descripto - /* Type for fuctions that handles signals */ - #define sig_handler RETSIGTYPE - C_MODE_START --typedef void (*sig_return)();/* Returns type from signal */ -+typedef void (*sig_return)(void);/* Returns type from signal */ - C_MODE_END - #if defined(__GNUC__) && !defined(_lint) - typedef char pchar; /* Mixed prototypes can take char */ -Index: include/my_pthread.h -=================================================================== ---- include/my_pthread.h.orig -+++ include/my_pthread.h -@@ -701,8 +701,8 @@ extern void my_thread_end(void); - extern const char *my_thread_name(void); - extern my_thread_id my_thread_dbug_id(void); - extern int pthread_dummy(int); --extern void my_mutex_init(); --extern void my_mutex_end(); -+extern void my_mutex_init(void); -+extern void my_mutex_end(void); - - /* All thread specific variables are in the following struct */ - -@@ -745,8 +745,8 @@ struct st_my_thread_var - }; - - extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const)); --extern void **my_thread_var_dbug(); --extern safe_mutex_t **my_thread_var_mutex_in_use(); -+extern void **my_thread_var_dbug(void); -+extern safe_mutex_t **my_thread_var_mutex_in_use(void); - extern uint my_thread_end_wait_time; - extern my_bool safe_mutex_deadlock_detector; - #define my_thread_var (_my_thread_var()) -Index: include/my_sys.h -=================================================================== ---- include/my_sys.h.orig -+++ include/my_sys.h -@@ -641,7 +641,7 @@ extern void my_osmaperr(unsigned lon - #endif - - extern void init_glob_errs(void); --extern const char** get_global_errmsgs(); -+extern const char** get_global_errmsgs(void); - extern void wait_for_free_space(const char *filename, int errors); - extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags); - extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags); -@@ -666,7 +666,7 @@ extern void my_printf_error(uint my_err, - ATTRIBUTE_FORMAT(printf, 2, 4); - extern void my_printv_error(uint error, const char *format, myf MyFlags, - va_list ap); --extern int my_error_register(const char** (*get_errmsgs) (), -+extern int my_error_register(const char** (*get_errmsgs) (void), - uint first, uint last); - extern const char **my_error_unregister(uint first, uint last); - extern void my_message(uint my_err, const char *str,myf MyFlags); -@@ -884,12 +884,12 @@ extern uint my_set_max_open_files(uint f - void my_free_open_file_info(void); - - extern my_bool my_gethwaddr(uchar *to); --extern int my_getncpus(); -+extern int my_getncpus(void); - - #define HRTIME_RESOLUTION 1000000ULL /* microseconds */ - typedef struct {ulonglong val;} my_hrtime_t; --void my_time_init(); --extern my_hrtime_t my_hrtime(); -+void my_time_init(void); -+extern my_hrtime_t my_hrtime(void); - extern ulonglong my_interval_timer(void); - extern ulonglong my_getcputime(void); - -@@ -948,7 +948,7 @@ int my_msync(int, void *, size_t, int); - void my_uuid_init(ulong seed1, ulong seed2); - void my_uuid(uchar *guid); - void my_uuid2str(const uchar *guid, char *s); --void my_uuid_end(); -+void my_uuid_end(void); - - /* character sets */ - extern void my_charset_loader_init_mysys(MY_CHARSET_LOADER *loader); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.0.21-mysql-test_main_bootstrap.patch new/mysql-patches/mysql-patches/mariadb-10.0.21-mysql-test_main_bootstrap.patch --- old/mysql-patches/mysql-patches/mariadb-10.0.21-mysql-test_main_bootstrap.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.0.21-mysql-test_main_bootstrap.patch 2015-11-12 14:14:59.000000000 +0100 @@ -0,0 +1,19 @@ +PATCH-P1-FIX-UPSTREAM: Change test result default charset to utf8 +BUGS: bnc#937787, MDEV-8486 + +Default value of the 'DEFAULT_CHARSET' option is 'latin1', but we use +'utf8'. Therefore the test result has to be adjusted accordingly. + +Maintainer: Kristyna Streitova <[email protected]> + +--- mariadb-10.0.20/mysql-test/r/bootstrap.result ++++ mariadb-10.0.20/mysql-test/r/bootstrap.result +@@ -20,7 +20,7 @@ show create table t1; + Table Create Table + t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ++) ENGINE=MyISAM DEFAULT CHARSET=utf8 + drop table t1; + select * from mysql.plugin; + name dl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-10.0.22-fix_build_denabled_profiling_off.patch new/mysql-patches/mysql-patches/mariadb-10.0.22-fix_build_denabled_profiling_off.patch --- old/mysql-patches/mysql-patches/mariadb-10.0.22-fix_build_denabled_profiling_off.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-10.0.22-fix_build_denabled_profiling_off.patch 2015-11-25 16:54:50.000000000 +0100 @@ -0,0 +1,27 @@ +PATCH-P1-FIX-UPSTREAM: Fix build with -DENABLED_PROFILING=OFF + +[MDEV-9136], Fix Versions: 10.1.9, 10.0.23 + +From bf186312e19bfe1e1cc5f83fc8280c84b7a17b21 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik <[email protected]> +Date: Fri, 30 Oct 2015 13:06:02 +0100 +Subject: [PATCH] fix compilation with -DENABLED_PROFILING=OFF + +(with ENABLED_PROFILING=ON, field.h was included indirectly +from sql_profile.h) +--- + sql/sql_class.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sql/sql_class.h b/sql/sql_class.h +index b2fa684..a94236a 100644 +--- a/sql/sql_class.h ++++ b/sql/sql_class.h +@@ -27,6 +27,7 @@ + #include "log.h" + #include "rpl_tblmap.h" + #include "mdl.h" ++#include "field.h" // Create_field + #include "probes_mysql.h" + #include "sql_locale.h" /* my_locale_st */ + #include "sql_profile.h" /* PROFILING */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.6.12-srv_buf_size.patch new/mysql-patches/mysql-patches/mysql-community-server-5.6.12-srv_buf_size.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.6.12-srv_buf_size.patch 2015-06-16 13:03:35.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.6.12-srv_buf_size.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Rename srv_buf_size variable -BUGS: upstream#70047 - -Variable was probably renamed sometime in the past but error was not triggered -because ifdef was not satisfied. - -Maintainer: Michal Hrusecky <[email protected]> - -Index: storage/innobase/row/row0log.cc -=================================================================== ---- storage/innobase/row/row0log.cc.orig -+++ storage/innobase/row/row0log.cc -@@ -2364,7 +2364,7 @@ all_done: - and be ignored when the operation is unsupported. */ - fallocate(index->online_log->fd, - FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, -- ofs, srv_buf_size); -+ ofs, srv_sort_buf_size); - #endif /* FALLOC_FL_PUNCH_HOLE */ - - next_mrec = index->online_log->head.block; -@@ -3152,7 +3152,7 @@ all_done: - and be ignored when the operation is unsupported. */ - fallocate(index->online_log->fd, - FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, -- ofs, srv_buf_size); -+ ofs, srv_sort_buf_size); - #endif /* FALLOC_FL_PUNCH_HOLE */ - - next_mrec = index->online_log->head.block; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/tools/gettar.sh new/mysql-patches/tools/gettar.sh --- old/mysql-patches/tools/gettar.sh 2015-06-16 13:03:35.000000000 +0200 +++ new/mysql-patches/tools/gettar.sh 2015-10-13 17:20:20.000000000 +0200 @@ -53,7 +53,7 @@ TO_PACK="./tools ./README ./MAINTAINERS" -echo "Will create tarball from following patches:" +echo "Will create tarball from the following patches:" while read patch; do patch="`echo "$patch" | sed -e 's|^[[:blank:]]*||' -e 's|[[:blank:]]*#.*||'`" [ -z "$patch" ] && continue @@ -63,7 +63,7 @@ exit 1 fi TO_PACK="$TO_PACK ./$NAME/$patch" - echo " * $patch" + echo " $patch" done << EOF `echo "$series" | while read serie; do cat "$serie" ++++++ series ++++++ --- /var/tmp/diff_new_pack.Fp9v3R/_old 2015-12-06 07:28:52.000000000 +0100 +++ /var/tmp/diff_new_pack.Fp9v3R/_new 2015-12-06 07:28:52.000000000 +0100 @@ -6,10 +6,10 @@ mysql-community-server-5.5.6-safe-process-in-bin.patch mariadb-10.0.17-group.patch mariadb-10.0.5-deharcode-libdir.patch -mysql-community-server-5.6.12-srv_buf_size.patch -mariadb-10.0.16-header_files_const_warnings.patch mariadb-10.0.15-fortify-and-O.patch mariadb-10.0.15-logrotate-su.patch mariadb-10.0.15-covscan-signexpr.patch mariadb-10.0.10-string-overflow.patch mariadb-10.0.20-tabxml-bufferoverflowstrncat.patch +mariadb-10.0.21-mysql-test_main_bootstrap.patch +mariadb-10.0.22-fix_build_denabled_profiling_off.patch
