mirror of
https://git.centos.org/rpms/mariadb.git
synced 2025-02-23 16:22:59 +00:00
allow rebuild after Oct 15 2015
This commit is contained in:
parent
bf6be7e402
commit
cee9fb4e56
2 changed files with 47 additions and 0 deletions
38
SOURCES/mariabd-events_1-10152015.patch
Normal file
38
SOURCES/mariabd-events_1-10152015.patch
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
From 7454f1c54cd310455ecc49a5c9af82fad96be66f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sergei Golubchik <serg@mariadb.org>
|
||||||
|
Date: Thu, 15 Oct 2015 08:49:58 +0200
|
||||||
|
Subject: [PATCH] fix events_1 test for October 2015
|
||||||
|
|
||||||
|
---
|
||||||
|
mysql-test/r/events_1.result | 3 ++-
|
||||||
|
mysql-test/t/events_1.test | 3 ++-
|
||||||
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/mysql-test/r/events_1.result b/mysql-test/r/events_1.result
|
||||||
|
index 7811549..637cd26 100644
|
||||||
|
--- a/mysql-test/r/events_1.result
|
||||||
|
+++ b/mysql-test/r/events_1.result
|
||||||
|
@@ -115,7 +115,8 @@ 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("20251010", 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 7cd488b..badcfe4 100644
|
||||||
|
--- a/mysql-test/t/events_1.test
|
||||||
|
+++ b/mysql-test/t/events_1.test
|
||||||
|
@@ -127,7 +127,8 @@ 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("20251010", 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;
|
|
@ -54,6 +54,8 @@ Patch18: mariadb-covscan-stroverflow.patch
|
||||||
Patch19: mariadb-ssltest.patch
|
Patch19: mariadb-ssltest.patch
|
||||||
#Patch20: mariadb-symbols-versioning.patch
|
#Patch20: mariadb-symbols-versioning.patch
|
||||||
Patch21: mariadb-headerfile.patch
|
Patch21: mariadb-headerfile.patch
|
||||||
|
# added by CentOS
|
||||||
|
Patch99: mariabd-events_1-10152015.patch
|
||||||
|
|
||||||
BuildRequires: perl, readline-devel, openssl-devel
|
BuildRequires: perl, readline-devel, openssl-devel
|
||||||
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
|
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
|
||||||
|
@ -225,6 +227,9 @@ MariaDB is a community developed branch of MySQL.
|
||||||
#%patch20 -p1
|
#%patch20 -p1
|
||||||
#%patch21 -p1
|
#%patch21 -p1
|
||||||
|
|
||||||
|
#added by CentOS
|
||||||
|
%patch99 -p1
|
||||||
|
|
||||||
# workaround for upstream bug #56342
|
# workaround for upstream bug #56342
|
||||||
rm -f mysql-test/t/ssl_8k_key-master.opt
|
rm -f mysql-test/t/ssl_8k_key-master.opt
|
||||||
|
|
||||||
|
@ -733,6 +738,10 @@ fi
|
||||||
%{_mandir}/man1/mysql_client_test.1*
|
%{_mandir}/man1/mysql_client_test.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
- Sat Nov 21 2015 Johnny Hughes
|
||||||
|
- added upstream patch https://github.com/MariaDB/server/commit/7454f1c54cd310455ecc49a5c9af82fad96be66f.patch
|
||||||
|
to fix a date timebomb and allow build after 10/15/2015
|
||||||
|
|
||||||
* Mon Sep 21 2015 Jakub Dorňák <jdornak@redhat.com> - 1:5.5.44-2
|
* Mon Sep 21 2015 Jakub Dorňák <jdornak@redhat.com> - 1:5.5.44-2
|
||||||
- Rebuild
|
- Rebuild
|
||||||
Related: #1247022
|
Related: #1247022
|
||||||
|
|
Loading…
Add table
Reference in a new issue