bk commit into 5.1 tree (cmiller:1.2380)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-07 12:21:42-05:00, cmiller@stripped +2 -0
  Post-merge cleanup and fix minor BUILD/... "="-equality syntax 
  error.

  BUILD/SETUP.sh@stripped, 2007-01-07 12:21:39-05:00, cmiller@stripped +1 -1
    Use POSIX "=" equality shell test.

  mysql-test/r/view.result@stripped, 2007-01-07 12:21:39-05:00, cmiller@stripped +4
-4
    Revert year drift.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint-greener

--- 1.195/mysql-test/r/view.result	2007-01-07 12:21:47 -05:00
+++ 1.196/mysql-test/r/view.result	2007-01-07 12:21:47 -05:00
@@ -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');

--- 1.65/BUILD/SETUP.sh	2007-01-07 12:21:47 -05:00
+++ 1.66/BUILD/SETUP.sh	2007-01-07 12:21:47 -05:00
@@ -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"