Fix test that used a hardcoded date (2017-01-01).
This commit is contained in:
parent
ff1ca8592c
commit
a5b2635364
36
community-mysql-events2-2017.patch
Normal file
36
community-mysql-events2-2017.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
commit cdad2b3a25506e7814c9eece71f575ac54249058
|
||||||
|
Author: Horst Hunger <horst.hunger@oracle.com>
|
||||||
|
Date: Tue Jan 3 09:06:19 2017 +0100
|
||||||
|
|
||||||
|
Bug#25335897: Modified the year of the date value from 2017 to 2037 in first event.
|
||||||
|
|
||||||
|
diff --git a/mysql-test/r/events_2.result b/mysql-test/r/events_2.result
|
||||||
|
index 66ec00d..31a501d 100644
|
||||||
|
--- a/mysql-test/r/events_2.result
|
||||||
|
+++ b/mysql-test/r/events_2.result
|
||||||
|
@@ -1,10 +1,10 @@
|
||||||
|
drop database if exists events_test;
|
||||||
|
create database events_test;
|
||||||
|
use events_test;
|
||||||
|
-create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;
|
||||||
|
+create event e_26 on schedule at '2037-01-01 00:00:00' disable do set @a = 5;
|
||||||
|
select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;
|
||||||
|
db name body definer convert_tz(execute_at, 'UTC', 'SYSTEM') on_completion
|
||||||
|
-events_test e_26 set @a = 5 root@localhost 2017-01-01 00:00:00 DROP
|
||||||
|
+events_test e_26 set @a = 5 root@localhost 2037-01-01 00:00:00 DROP
|
||||||
|
drop event e_26;
|
||||||
|
create event e_26 on schedule at NULL disable do set @a = 5;
|
||||||
|
ERROR HY000: Incorrect AT value: 'NULL'
|
||||||
|
diff --git a/mysql-test/t/events_2.test b/mysql-test/t/events_2.test
|
||||||
|
index 3d60965..d90ec10 100644
|
||||||
|
--- a/mysql-test/t/events_2.test
|
||||||
|
+++ b/mysql-test/t/events_2.test
|
||||||
|
@@ -13,7 +13,7 @@ use events_test;
|
||||||
|
# mysql.event intact checking end
|
||||||
|
#
|
||||||
|
|
||||||
|
-create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;
|
||||||
|
+create event e_26 on schedule at '2037-01-01 00:00:00' disable do set @a = 5;
|
||||||
|
select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;
|
||||||
|
drop event e_26;
|
||||||
|
--error ER_WRONG_VALUE
|
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
Name: community-mysql
|
Name: community-mysql
|
||||||
Version: 5.7.17
|
Version: 5.7.17
|
||||||
Release: 1%{?with_debug:.debug}%{?dist}
|
Release: 2%{?with_debug:.debug}%{?dist}
|
||||||
Summary: MySQL client programs and shared libraries
|
Summary: MySQL client programs and shared libraries
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://www.mysql.com
|
URL: http://www.mysql.com
|
||||||
@ -120,6 +120,7 @@ Patch6: %{pkgnamepatch}-paths.patch
|
|||||||
# Patches specific for this mysql package
|
# Patches specific for this mysql package
|
||||||
Patch51: %{pkgnamepatch}-chain-certs.patch
|
Patch51: %{pkgnamepatch}-chain-certs.patch
|
||||||
Patch52: %{pkgnamepatch}-sharedir.patch
|
Patch52: %{pkgnamepatch}-sharedir.patch
|
||||||
|
Patch53: %{pkgnamepatch}-events2-2017.patch
|
||||||
Patch70: %{pkgnamepatch}-5.7.9-major.patch
|
Patch70: %{pkgnamepatch}-5.7.9-major.patch
|
||||||
|
|
||||||
# Patches taken from boost 1.59
|
# Patches taken from boost 1.59
|
||||||
@ -393,6 +394,7 @@ the MySQL sources.
|
|||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch51 -p1
|
%patch51 -p1
|
||||||
%patch52 -p1
|
%patch52 -p1
|
||||||
|
%patch53 -p1
|
||||||
%if %{with_shared_lib_major_hack}
|
%if %{with_shared_lib_major_hack}
|
||||||
%patch70 -p1
|
%patch70 -p1
|
||||||
%endif
|
%endif
|
||||||
@ -964,6 +966,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 04 2017 Norvald H. Ryeng <norvald.ryeng@oracle.com> - 5.7.17-2
|
||||||
|
- Fix test that used a hardcoded date (2017-01-01)
|
||||||
|
|
||||||
* Mon Dec 12 2016 Norvald H. Ryeng <norvald.ryeng@oracle.com> - 5.7.17-1
|
* Mon Dec 12 2016 Norvald H. Ryeng <norvald.ryeng@oracle.com> - 5.7.17-1
|
||||||
- Update to MySQL 5.7.17, for various fixes described at
|
- Update to MySQL 5.7.17, for various fixes described at
|
||||||
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-17.html
|
https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-17.html
|
||||||
|
Loading…
Reference in New Issue
Block a user