diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-10 12:37:06 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-10 12:37:06 +0500 |
| commit | 9c46621dca2968634f40517aa8b1c8cb3d03dfeb (patch) | |
| tree | bc5dc0893fabbd8caf6509d695c69d3ecd105d05 /mysql-test/r/view.result | |
| parent | 09ddd95132bab10413017366e1359301471688b8 (diff) | |
| parent | 62f72d36103ad5bcc50a43c87efc9caed2f50cf5 (diff) | |
| download | mariadb-git-9c46621dca2968634f40517aa8b1c8cb3d03dfeb.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
sql/item_timefunc.h:
Auto merged
mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
Auto merged
sql/set_var.cc:
manual merge.
mysql-test/r/view.result:
manual merge
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
manual merge
mysql-test/t/view.test:
manual merge
Diffstat (limited to 'mysql-test/r/view.result')
| -rw-r--r-- | mysql-test/r/view.result | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 93b91370d86..7ec3e136c14 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2701,19 +2701,18 @@ CREATE TABLE t1( fName varchar(25) NOT NULL, lName varchar(25) NOT NULL, DOB date NOT NULL, +test_date 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'); +INSERT INTO t1(fName, lName, DOB, test_date) VALUES +('Hank', 'Hill', '1964-09-29', '2007-01-01'), +('Tom', 'Adams', '1908-02-14', '2007-01-01'), +('Homer', 'Simpson', '1968-03-05', '2007-01-01'); CREATE VIEW v1 AS -SELECT (year(now())-year(DOB)) AS Age +SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75; SHOW CREATE VIEW v1; -View Create View character_set_client collation_connection -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) latin1 latin1_swedish_ci -set timestamp=1136066400; -SELECT (year(now())-year(DOB)) AS Age FROM t1 HAVING Age < 75; +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(`t1`.`test_date`) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75) +SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75; Age 42 38 |