Commit 12d6f553 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M51/mysql-5.1 

into  trift2.:/MySQL/M51/push-5.1


server-tools/instance-manager/Makefile.am:
  Manual merge of two identical, independent fixes.
parents 9da73670 f20cb8d0

mysql-test/r/view.result

+4 −4
Original line number Diff line number Diff line
@@ -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

42

38

43

39

SELECT * FROM v1;

Age

42

38

43

39

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');