Skip to content
GitLab
Commit 154e8a3f authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Update changelog and refresh patches after 10.0.27 import

parent 92944ea5
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 154e8a3f
mariadb-10.0 (10.0.26-0ubuntu0.16.04.1) UNRELEASED; urgency=low
mariadb-10.0 (10.0.27-0ubuntu0.16.04.1) xenial-security; urgency=low
[ Otto Kekäläinen ]
* SECURITY UPDATE: New upstream release 10.0.26. Includes fixes for the
* SECURITY UPDATE: New upstream release 10.0.27. Includes fixes for the
following security vulnerabilities (LP: #1605493):
- CVE-2016-5440
- CVE-2016-6662
* Previous release 10.0.26 included included fixes for
the following security vulnerabilities:
- CVE-2016-3615
- CVE-2016-3521
- CVE-2016-3477
* Update old changelog entries to include new CVE identifiers
[ Vicențiu Ciorbaru ]
* Revert InnoDB and XtraDB Power 8 synchronization fix from upstream 10.0.26
to fix failing builds on ppc64el
-- Otto Kekäläinen <otto@debian.org> Sat, 23 Jul 2016 02:38:09 +0300
-- Otto Kekäläinen <otto@debian.org> Wed, 14 Sep 2016 22:30:17 +0300
mariadb-10.0 (10.0.25-0ubuntu0.16.04.1) xenial-security; urgency=low
......
debian/patches/fix-spelling-errors.patch
View file @ 154e8a3f
......@@ -84,7 +84,7 @@ Last-Update: 2014-10-02
44 ru_UA Russian - Ukraine 8 11 , . russian
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7085,7 +7085,7 @@ struct my_option my_long_options[]=
@@ -7076,7 +7076,7 @@ struct my_option my_long_options[]=
&opt_show_slave_auth_info, &opt_show_slave_auth_info, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"skip-bdb", OPT_DEPRECATED_OPTION,
......@@ -93,7 +93,7 @@ Last-Update: 2014-10-02
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifndef DISABLE_GRANT_OPTIONS
{"skip-grant-tables", 0,
@@ -8414,7 +8414,7 @@ mysqld_get_one_option(int optid,
@@ -8411,7 +8411,7 @@ mysqld_get_one_option(int optid,
break;
case OPT_DEPRECATED_OPTION:
sql_print_warning("'%s' is deprecated. It does nothing and exists only "
......
debian/patches/innodb_xtradb_10.0.26_regression.patch deleted 100644 → 0
View file @ 92944ea5
Description: Revert innodb and xtradb PowerPC synchronization from 10.0.26
On PowerPC 64 Little Endian we have synchronization problems that causes
warnings in test cases. The patch reverts these changes from 10.0.26 that
caused this regression.
The patch was initially proposed by Sergey Vojtovich, altered slightly to
have it compile.
.
This patch should be removed when upstream provides an adequate fix.
Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
index 1cf4e9c..1abb774 100644
--- a/storage/innobase/include/os0sync.h
+++ b/storage/innobase/include/os0sync.h
@@ -492,7 +492,8 @@ inline
lock_word_t
os_atomic_clear(volatile lock_word_t* ptr)
{
- return(__sync_lock_test_and_set(ptr, 0));
+ __sync_lock_release(ptr);
+ return *ptr;
}
# elif defined(HAVE_IB_GCC_ATOMIC_TEST_AND_SET)
@@ -861,6 +862,7 @@ for synchronization */
architecture. Disable memory barrier for Intel architecture for now. */
# define os_rmb do { } while(0)
# define os_wmb do { } while(0)
+# define os_mb do { } while(0)
# define os_isync do { } while(0)
# define IB_MEMORY_BARRIER_STARTUP_MSG \
"Memory barrier is not used"
diff --git a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
index 55f728f..0b6858a 100644
--- a/storage/innobase/include/sync0sync.ic
+++ b/storage/innobase/include/sync0sync.ic
@@ -178,6 +178,8 @@ mutex_exit_func(
to wake up possible hanging threads if
they are missed in mutex_signal_object. */
+ os_mb;
+
if (mutex_get_waiters(mutex) != 0) {
mutex_signal_object(mutex);
diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h
index 0f93f3f..2aa9478 100644
--- a/storage/xtradb/include/os0sync.h
+++ b/storage/xtradb/include/os0sync.h
@@ -543,7 +543,8 @@ inline
lock_word_t
os_atomic_clear(volatile lock_word_t* ptr)
{
- return(__sync_lock_test_and_set(ptr, 0));
+ __sync_lock_release(ptr);
+ return *ptr;
}
# elif defined(HAVE_IB_GCC_ATOMIC_TEST_AND_SET)
@@ -912,6 +913,7 @@ for synchronization */
architecture. Disable memory barrier for Intel architecture for now. */
# define os_rmb do { } while(0)
# define os_wmb do { } while(0)
+# define os_mb do { } while(0)
# define os_isync do { } while(0)
# define IB_MEMORY_BARRIER_STARTUP_MSG \
"Memory barrier is not used"
diff --git a/storage/xtradb/include/sync0sync.ic b/storage/xtradb/include/sync0sync.ic
index 00db854..fac83a4 100644
--- a/storage/xtradb/include/sync0sync.ic
+++ b/storage/xtradb/include/sync0sync.ic
@@ -181,6 +181,8 @@ mutex_exit_func(
to wake up possible hanging threads if
they are missed in mutex_signal_object. */
+ os_mb;
+
if (mutex_get_waiters(mutex) != 0) {
mutex_signal_object(mutex);
debian/patches/mdev-8375-built-in-auth-socket.patch
View file @ 154e8a3f
......@@ -9,7 +9,7 @@ Bug: https://jira.mariadb.org/browse/MDEV-8375
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3644,6 +3644,9 @@ sub mysql_install_db {
@@ -3629,6 +3629,9 @@ sub mysql_install_db {
mtr_tofile($bootstrap_sql_file,
"DELETE FROM mysql.user where user= '';\n");
......
debian/patches/mysql-test__db_test.patch
View file @ 154e8a3f
......@@ -6,7 +6,7 @@
## DP: suite depends on them.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3606,6 +3606,11 @@ sub mysql_install_db {
@@ -3591,6 +3591,11 @@ sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file);
......
debian/patches/series
View file @ 154e8a3f
......@@ -13,4 +13,3 @@ mysqld_multi.server_lsb-header.patch
mdev-8375-passwordless-root-via-socket-auth.patch
mdev-8375-built-in-auth-socket.patch
mdev-9528-mysql_embedded.patch
innodb_xtradb_10.0.26_regression.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment