Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/mysql_src/mysql-5.0-clean

configure.in

@@ -2629,7 +2629,7 @@ AC_SUBST(server_scripts)
 sql_union_dirs=" $sql_server_dirs "
 for DIR in $sql_client_dirs
 do
-  if echo $sql_union_dirs | grep " $DIR " >/dev/null
+  if echo " $sql_union_dirs " | grep " $DIR " >/dev/null
   then
     :  # already present, skip
   else