Add patch to fix erroneous check for binlog structures

This patch fixes the issue when mysql fails with segfault
due to binlog structures being non-initialized with '-1'
used as a array index of structures with binlog configuration

Change-Id: Ib3e2ed88bd3169c6df303df52e26ffa35e47d5ee
Original-author: Dmitry Bilunov <dbilunov@mirantis.com>
Closes-bug: 1541338

diff --git a/debian/changelog b/debian/changelog
index 53896f0eecae6ac1bc2bc7e14bfeb7c75dd85ec6..fd89770d946c656326fac2681153c6c5f7f46d74 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mysql-wsrep-5.6 (5.6.23-1~u14.04+mos2) mos9.0; urgency=medium
+
+  * Temporary fix for LP Bug 1541338
+
+ -- Dmitry Bilunov <dbilunov@mirantis.com>  Wed, 23 Mar 2016 13:54:00 +0300
+
 mysql-wsrep-5.6 (5.6.23-1~u14.04+mos1) mos7.0; urgency=medium
 
   * Update to MySQL 5.6.23:

diff --git a/debian/patches/mysql1541338.patch b/debian/patches/mysql1541338.patch
new file mode 100644 (file)
index 0000000..da8dda9
--- /dev/null
+++ b/debian/patches/mysql1541338.patch
@@ -0,0 +1,11 @@
+diff --git a/sql/sql_class.cc b/mysql-wsrep-5.6/sql/sql_class.cc
+index 79d56ad..ac55818 100644
+--- a/sql/sql_class.cc
++++ b/sql/sql_class.cc
+@@ -665,6 +665,7 @@ void thd_storage_lock_wait(THD *thd, long long value)
+ extern "C"
+ void *thd_get_ha_data(const THD *thd, const struct handlerton *hton)
+ {
++  if (hton->slot == -1) return NULL;
+   return *thd_ha_data(thd, hton);
+ }

diff --git a/debian/patches/series b/debian/patches/series
index eae7eb5e160e1c595750b6aa3788c603bd1cffd6..8e956af3c32acdb5042e0629a0141668a4540c4b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ kfreebsd_tests.patch
 spelling.patch
 mysql-5.6.23_wsrep_25.10.patch
 wsrep_sst_mysqldump.patch
+mysql1541338.patch