[Pkg-mysql-commits] [mariadb-5.5] 01/01: New patch: Extend date in test suite so that main.events_1 will pass

[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 d315cf0b611b22988648d280036c657af2fd7faf
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Wed Nov 4 11:56:40 2015 +0200

    New patch: Extend date in test suite so that main.events_1 will pass
---
 debian/changelog                                   |  1 +
 debian/patches/80_fix-events-test-to-year2020.diff | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6b6edb1..eeea6b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ mariadb-5.5 (5.5.46-1ubuntu0.14.04.2) trusty-security; urgency=low
     - CVE-2015-4819
     - CVE-2015-4879
   * Update new Oracle CVE identifiers to old MariaDB changelog entries
+  * New patch: Extend date in test suite so that main.events_1 will pass
 
  -- Otto Kekäläinen <otto at seravo.fi>  Tue, 03 Nov 2015 11:41:30 +0200
 
diff --git a/debian/patches/80_fix-events-test-to-year2020.diff b/debian/patches/80_fix-events-test-to-year2020.diff
new file mode 100644
index 0000000..6eda2cb
--- /dev/null
+++ b/debian/patches/80_fix-events-test-to-year2020.diff
@@ -0,0 +1,27 @@
+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 479a9ca..d24cdee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,6 @@
 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