From 539c4da16d0e3c68005cbc196f6f474803653fa5 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 6 Jan 2007 18:32:55 -0500 Subject: Use relative dates so that the tests don't fail when the year changes. --- mysql-test/r/view.result | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mysql-test/r/view.result') diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 4bc122cc97b..794274e1927 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2675,9 +2675,9 @@ lName varchar(25) NOT NULL, DOB date NOT NULL, uID int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY); INSERT INTO t1(fName, lName, DOB) VALUES -('Hank', 'Hill', '1964-09-29'), -('Tom', 'Adams', '1908-02-14'), -('Homer', 'Simpson', '1968-03-05'); +('Alice', 'Hill', date_sub(curdate(), interval 15271 day)), +('Bob', 'Adams', date_sub(curdate(), interval 33600 day)), +('Carol', 'Simpson', date_sub(curdate(), interval 13700 day)); CREATE VIEW v1 AS SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75; -- cgit v1.2.1 From 4d106e4c986b51a7c843ead2370ebb4885dadd1d Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 7 Jan 2007 12:21:42 -0500 Subject: Post-merge cleanup and fix minor BUILD/... "="-equality syntax error. BUILD/SETUP.sh: Use POSIX "=" equality shell test. mysql-test/r/view.result: Revert year drift. --- mysql-test/r/view.result | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mysql-test/r/view.result') diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 5773c51803d..794274e1927 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2686,12 +2686,12 @@ View Create View v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(now()) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75) SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75; Age -43 -39 +42 +38 SELECT * FROM v1; Age -43 -39 +42 +38 DROP VIEW v1; DROP TABLE t1; CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx'); -- cgit v1.2.1