[Pkg-mysql-commits] [mariadb-5.5] 03/03: Update changelog and refresh patches after 5.5.47 import

[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.04
in repository mariadb-5.5.

commit e2c653d6f40d924786436ef56f6802ec720873ca
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Thu Dec 10 10:29:25 2015 +0200

    Update changelog and refresh patches after 5.5.47 import
---
 debian/changelog                                   |  8 +++++++
 debian/patches/80_fix-events-test-to-year2020.diff | 27 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eeea6b3..7726626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mariadb-5.5 (5.5.47-1ubuntu0.14.04.2) trusty-updates; urgency=low
+
+  * New upstream release
+    - Adds the mariadb-slow.log into the logrotate file, as the file
+      name mariadb-slow.log is the log name in the default config file.
+
+ -- Otto Kekäläinen <otto at seravo.fi>  Thu, 10 Dec 2015 10:24:40 +0200
+
 mariadb-5.5 (5.5.46-1ubuntu0.14.04.2) trusty-security; urgency=low
 
   * SECURITY UPDATE: Update to 5.5.46 to fix security issues (LP: #1512241):
diff --git a/debian/patches/80_fix-events-test-to-year2020.diff b/debian/patches/80_fix-events-test-to-year2020.diff
deleted file mode 100644
index 6eda2cb..0000000
--- a/debian/patches/80_fix-events-test-to-year2020.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Otto Kekäläinen <otto at seravo.fi>
-Description: Extend date in test suite so that main.events_1 will pass
-
---- a/mysql-test/r/events_1.result
-+++ b/mysql-test/r/events_1.result
-@@ -114,7 +114,7 @@ create table t_event3 (a int, b float);
- drop event if exists event3;
- Warnings:
- Note	1305	Event event3 does not exist
--create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20151010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());
-+create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20201010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());
- select count(*) from t_event3;
- count(*)
- 0
-diff --git a/mysql-test/t/events_1.test b/mysql-test/t/events_1.test
-index 7f31e3f..c20f178 100644
---- a/mysql-test/t/events_1.test
-+++ b/mysql-test/t/events_1.test
-@@ -125,7 +125,7 @@ drop event existant;
- 
- create table t_event3 (a int, b float);
- drop event if exists event3;
--create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20151010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());
-+create event event3 on schedule every 50 + 10 minute starts date_add("20100101", interval 5 minute) ends date_add("20201010", interval 5 day) comment "portokala_comment" DO insert into t_event3 values (unix_timestamp(), rand());
- let $wait_condition=SELECT count(*)=0 from t_event3;
- --source include/wait_condition.inc
- select count(*) from t_event3;
diff --git a/debian/patches/series b/debian/patches/series
index d24cdee..479a9ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,5 @@
 50_mysql-test__db_test.diff
 61_replace_dash_with_bash_mbug675185.diff
 75_man_syntax_fixes.diff
-80_fix-events-test-to-year2020.diff
 82_extend_default_test_timeout_for_tokudb.diff
 99_remove_rename_mariadb-server_files_in.diff

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