Commit fa322efd authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Update changelog and refresh patches after 5.5.52 import

parent 955e2819
mariadb-5.5 (5.5.50-1ubuntu0.14.04.1) UNRELEASED; urgency=low mariadb-5.5 (5.5.52-1ubuntu0.14.04.1) trusty-security; urgency=low
* SECURITY UPDATE: New upstream release 5.5.50 (LP: #1605493) * SECURITY UPDATE: New upstream release 5.5.52 (LP: #1605493)
- Latest maintenance release includes only fixes to serious bugs.
* Previous release 5.5.51 included included fixes for
the following security vulnerabilities:
- CVE-2016-6662
* Previous release 5.5.50 included included fixes for
the following security vulnerabilities:
- CVE-2016-5440 - CVE-2016-5440
- CVE-2016-3615 - CVE-2016-3615
- CVE-2016-3521 - CVE-2016-3521
- CVE-2016-3477 - CVE-2016-3477
* Update previous changelog entries to contain new CVE identifiers * Update previous changelog entries to contain new CVE identifiers
-- Otto Kekäläinen <otto@debian.org> Fri, 22 Jul 2016 09:24:36 +0300 -- Otto Kekäläinen <otto@debian.org> Wed, 14 Sep 2016 21:01:08 +0300
mariadb-5.5 (5.5.49-1ubuntu0.14.04.1) trusty-security; urgency=low mariadb-5.5 (5.5.49-1ubuntu0.14.04.1) trusty-security; urgency=low
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
## DP: circumstances as it is checked first. See #301741. ## DP: circumstances as it is checked first. See #301741.
## DP: http://bugs.mysql.com/bug.php?id=6901 ## DP: http://bugs.mysql.com/bug.php?id=6901
--- old/scripts/mysql_system_tables_data.sql 2008-12-04 22:59:44.000000000 +0100 --- a/scripts/mysql_system_tables_data.sql
+++ new/scripts/mysql_system_tables_data.sql 2008-12-04 23:00:07.000000000 +0100 +++ b/scripts/mysql_system_tables_data.sql
@@ -30,8 +30,6 @@ SELECT LOWER( REPLACE((SELECT REPLACE(@@ @@ -30,8 +30,6 @@ SELECT LOWER( REPLACE((SELECT REPLACE(@@
-- Fill "db" table with default grants for anyone to -- Fill "db" table with default grants for anyone to
-- access database 'test' and 'test_%' if "db" table didn't exist -- access database 'test' and 'test_%' if "db" table didn't exist
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
## DP: scripts__mysql_install_db.sh__no_test ## DP: scripts__mysql_install_db.sh__no_test
## DP: http://bugs.mysql.com/bug.php?id=6901 ## DP: http://bugs.mysql.com/bug.php?id=6901
--- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh 2008-01-29 22:41:20.000000000 +0100 --- a/scripts/mysql_install_db.sh
+++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh 2008-02-28 10:08:11.000000000 +0100 +++ b/scripts/mysql_install_db.sh
@@ -372,7 +372,7 @@ then @@ -372,7 +372,7 @@ then
fi fi
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
## DP: suite depends on them. ## DP: suite depends on them.
--- a/mysql-test/mysql-test-run.pl --- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl
@@ -3573,6 +3573,11 @@ sub mysql_install_db { @@ -3556,6 +3556,11 @@ sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql", mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file); $bootstrap_sql_file);
......
...@@ -5,12 +5,11 @@ ...@@ -5,12 +5,11 @@
## DP: A race in dash causes mysqld_safe to occasionally loop infinitely. ## DP: A race in dash causes mysqld_safe to occasionally loop infinitely.
## DP: Fix by using bash instead. ## DP: Fix by using bash instead.
## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185 ## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185
--- old/scripts/mysqld_safe.sh 2010-04-09 11:47:18 +0000 --- a/scripts/mysqld_safe.sh
+++ new/scripts/mysqld_safe.sh 2010-11-21 09:40:50 +0000 +++ b/scripts/mysqld_safe.sh
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/bin/sh -#!/bin/sh
+#!/bin/bash +#!/bin/bash
# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
# This file is public domain and comes with NO WARRANTY of any kind # This file is public domain and comes with NO WARRANTY of any kind
# #
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