From: Dmitry Bilunov <dbilunov@mirantis.com>
Date: Thu, 24 Mar 2016 11:59:02 +0000 (+0000)
Subject: Revert "Add patch to fix erroneous check for binlog structures"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;p=packages%2Ftrusty%2Fmysql-wsrep-5.6.git

Revert "Add patch to fix erroneous check for binlog structures"

Applying this fix does not seem to have any effect on the number of this
bug's reproductions.

This reverts commit 8ab894e098c4d1c30032e15abbe5a6241e0eb5c6.

Change-Id: I9a1fc445bc4b0785b028bb281936580568c7bccd
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
---

diff --git a/debian/changelog b/debian/changelog
index fd89770d..f922342f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mysql-wsrep-5.6 (5.6.23-1~u14.04+mos3) mos9.0; urgency=medium
+
+  * Reverting temporary fix for LP Bug 1541338 as it's not RC
+
+ -- Sergii Golovatiuk <sgolovatiuk@mirantis.com> Sat, 26 Mar 2016 13:19:00 +0100
+
 mysql-wsrep-5.6 (5.6.23-1~u14.04+mos2) mos9.0; urgency=medium
 
   * Temporary fix for LP Bug 1541338
diff --git a/debian/patches/mysql1541338.patch b/debian/patches/mysql1541338.patch
deleted file mode 100644
index da8dda9c..00000000
--- a/debian/patches/mysql1541338.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 8e956af3..eae7eb5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ kfreebsd_tests.patch
 spelling.patch
 mysql-5.6.23_wsrep_25.10.patch
 wsrep_sst_mysqldump.patch
-mysql1541338.patch