[Pkg-mysql-commits] [mariadb-5.5] 03/05: Removed hotfix patch to MDEV-8115 which is now fixed in upstream release

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch ubuntu-14.10
in repository mariadb-5.5.

commit e58749b787f627f0b05e9d15038d424f7794971c
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Sat Jun 13 21:15:52 2015 +0300

    Removed hotfix patch to MDEV-8115 which is now fixed in upstream release
---
 debian/patches/10_mysql_upgrade_crash_fix.patch | 61 -------------------------
 debian/patches/series                           |  1 -
 2 files changed, 62 deletions(-)

diff --git a/debian/patches/10_mysql_upgrade_crash_fix.patch b/debian/patches/10_mysql_upgrade_crash_fix.patch
deleted file mode 100644
index 7a0c34e..0000000
--- a/debian/patches/10_mysql_upgrade_crash_fix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From https://github.com/MariaDB/server/commit/0014bdc7.patch
-From: Sergei Golubchik <serg at mariadb.org>
-Date: Thu, 7 May 2015 22:18:34 +0200
-Subject: [PATCH] MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
-
-on REPAIR don't do table-specific stuff for views
-(because even if the view has a temp table opened for it,
-it's not opened all the way down the engine. In particular,
-Aria crashes in maria_status() because MARIA_HA* info - that is
-table->table->file->file - is NULL)
----
- mysql-test/r/repair.result | 7 +++++++
- mysql-test/t/repair.test   | 9 +++++++++
- sql/sql_admin.cc           | 2 +-
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result
-index 52ae9c3..51c3374 100644
---- a/mysql-test/r/repair.result
-+++ b/mysql-test/r/repair.result
-@@ -207,3 +207,10 @@ check table t1;
- Table	Op	Msg_type	Msg_text
- test.t1	check	status	OK
- drop table t1;
-+create table t1 (a blob);
-+create view v1 as select * from t1;
-+repair view v1;
-+Table	Op	Msg_type	Msg_text
-+test.v1	repair	status	OK
-+drop view v1;
-+drop table t1;
-diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test
-index 337b73f..f625965 100644
---- a/mysql-test/t/repair.test
-+++ b/mysql-test/t/repair.test
-@@ -208,3 +208,12 @@ repair table t1 use_frm;
- select count(*) from t1;
- check table t1;
- drop table t1;
-+
-+#
-+# MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
-+#
-+create table t1 (a blob);
-+create view v1 as select * from t1;
-+repair view v1;
-+drop view v1;
-+drop table t1;
-diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
-index 44057b6..9827c67 100644
---- a/sql/sql_admin.cc
-+++ b/sql/sql_admin.cc
-@@ -901,7 +901,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
-         break;
-       }
-     }
--    if (table->table)
-+    if (table->table && !table->view)
-     {
-       if (table->table->s->tmp_table)
-       {
diff --git a/debian/patches/series b/debian/patches/series
index 8173b30..479a9ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-10_mysql_upgrade_crash_fix.patch
 33_scripts__mysql_create_system_tables__no_test.diff
 38_scripts__mysqld_safe.sh__signals.diff
 41_scripts__mysql_install_db.sh__no_test.diff

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git