Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge

mysql-test/r/view.result

@@ -2715,12 +2715,12 @@ View	Create View	character_set_client	collation_connection
 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)	latin1	latin1_swedish_ci
 SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75;
 Age
-44
-40
+43
+39
 SELECT * FROM v1;
 Age
-44
-40
+43
+39
 DROP VIEW v1;
 DROP TABLE t1;
 CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');