- up to 5.5.40

diff --git a/bug-73834.patch b/bug-73834.patch
deleted file mode 100644 (file)
index ac741c1..0000000
--- a/bug-73834.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From feac5e02ab298a5c3329ab63ee6db7d9f52bf28d Mon Sep 17 00:00:00 2001
-From: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
-Date: Mon, 8 Sep 2014 11:33:55 +0200
-Subject: [PATCH] Adding patch for security bug 19471516
-
----
- mysql-test/suite/innodb/r/foreign-keys.result | 16 ++++++++++++++++
- mysql-test/suite/innodb/t/foreign-keys.test   | 26 ++++++++++++++++++++++++++
- storage/innobase/dict/dict0dict.c             | 10 ++++++++++
- 3 files changed, 52 insertions(+)
- create mode 100644 mysql-test/suite/innodb/r/foreign-keys.result
- create mode 100644 mysql-test/suite/innodb/t/foreign-keys.test
-
-diff --git a/mysql-test/suite/innodb/r/foreign-keys.result b/mysql-test/suite/innodb/r/foreign-keys.result
-new file mode 100644
-index 0000000..be8d27b
---- /dev/null
-+++ b/mysql-test/suite/innodb/r/foreign-keys.result
-@@ -0,0 +1,16 @@
-+#
-+# Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
-+# ADD FOREIGN KEY
-+#
-+CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
-+PRIMARY KEY (`department_id`)) engine=innodb;
-+CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
-+`title_reporter_fk` INT, PRIMARY KEY (`title_id`));
-+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`));
-+ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
-+`people` (`people_id`);
-+ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
-+(`people_id`);
-+ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
-+(`people_id`);
-+drop table title, department, people;
-diff --git a/mysql-test/suite/innodb/t/foreign-keys.test b/mysql-test/suite/innodb/t/foreign-keys.test
-new file mode 100644
-index 0000000..45642cf
---- /dev/null
-+++ b/mysql-test/suite/innodb/t/foreign-keys.test
-@@ -0,0 +1,26 @@
-+--source include/have_innodb.inc
-+--source include/have_debug.inc
-+
-+--echo #
-+--echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
-+--echo # ADD FOREIGN KEY
-+--echo #
-+
-+CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
-+PRIMARY KEY (`department_id`)) engine=innodb;
-+
-+CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
-+`title_reporter_fk` INT, PRIMARY KEY (`title_id`));
-+
-+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`));
-+
-+ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
-+`people` (`people_id`);
-+
-+ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
-+(`people_id`);
-+
-+ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
-+(`people_id`);
-+
-+drop table title, department, people;
-diff --git a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
-index e225966..0e46916 100644
---- a/storage/innobase/dict/dict0dict.c
-+++ b/storage/innobase/dict/dict0dict.c
-@@ -1123,6 +1123,11 @@ dict_table_rename_in_cache(
-               /* The id will be changed.  So remove old one */
-               rbt_delete(foreign->foreign_table->foreign_rbt, foreign->id);
- 
-+              if (foreign->referenced_table) {
-+                      rbt_delete(foreign->referenced_table->referenced_rbt,
-+                                 foreign->id);
-+              }
-+
-               if (ut_strlen(foreign->foreign_table_name)
-                   < ut_strlen(table->name)) {
-                       /* Allocate a longer name buffer;
-@@ -1273,6 +1278,11 @@ dict_table_rename_in_cache(
-               rbt_insert(foreign->foreign_table->foreign_rbt,
-                          foreign->id, &foreign);
- 
-+              if (foreign->referenced_table) {
-+                      rbt_insert(foreign->referenced_table->referenced_rbt,
-+                                 foreign->id, &foreign);
-+              }
-+
-               foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
-       }
- 

diff --git a/mysql.spec b/mysql.spec
index e9758025a90f632e25450a3438f0cf85617fe6c7..a8fbd06b67020356fd8ce0f6d89bb8912c9ea6e7 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,7 +23,7 @@
 %bcond_with    tests           # FIXME: don't run correctly
 %bcond_with    ndb             # NDB is now a separate product, this here is broken, so disable it
 
-%define        percona_rel     36.0
+%define        percona_rel     36.1
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     MySQL: ist eine SQL-Datenbank
@@ -34,14 +34,14 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.5.39
-Release:       2
+Version:       5.5.40
+Release:       1
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
 # Source0:     http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
 Source0:       http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: 04a29911a22b44b0c55f9f449110b83e
+# Source0-md5: 51d05cf50f02b29b022f54b8e2da0db5
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.1.9-release.tar.gz
 # Source100-md5:       3b987baa64b9c050c92412a72c4d3059
 Source1:       %{name}.init
@@ -62,7 +62,6 @@ Source15:     lib%{name}.version
 
 Patch2:                %{name}hotcopy-5.0-5.5.patch
 Patch3:                bug-67402.patch
-Patch4:                bug-73834.patch
 # from fedora
 Patch6:                %{name}-system-users.patch
 
@@ -502,7 +501,6 @@ mv sphinx-*/mysqlse storage/sphinx
 
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %patch6 -p1