From 4d106e4c986b51a7c843ead2370ebb4885dadd1d Mon Sep 17 00:00:00 2001
From: unknown <cmiller@zippy.cornsilk.net>
Date: Sun, 7 Jan 2007 12:21:42 -0500
Subject: [PATCH] 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.
---
 BUILD/SETUP.sh           | 2 +-
 mysql-test/r/view.result | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index dfbf1547517..1f62ffe7c26 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -183,7 +183,7 @@ fi
 # (http://samba.org/ccache) is installed, use it.
 # We use 'grep' and hope 'grep' will work as expected
 # (returns 0 if finds lines)
-if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" == "1"
+if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1"
 then
   echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"
   echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"
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');