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

into  mysql.com:/usr/home/bar/mysql-5.0.b14255

config/ac-macros/zlib.m4

@@ -19,7 +19,7 @@ INCLUDES="$INCLUDES $ZLIB_INCLUDES"
 LIBS="$LIBS $ZLIB_LIBS"
 AC_CACHE_VAL([mysql_cv_compress],
   [AC_TRY_LINK([#include <zlib.h>],
-    [return compress(0, (unsigned long*) 0, "", 0);],
+    [return zlibCompileFlags();],
     [mysql_cv_compress="yes"
     AC_MSG_RESULT([ok])],
     [mysql_cv_compress="no"])

sql/ha_federated.cc

@@ -2615,7 +2615,7 @@ int ha_federated::stash_remote_error()
 {
   DBUG_ENTER("ha_federated::stash_remote_error()");
   remote_error_number= mysql_errno(mysql);
-  my_snprintf(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE, 
+  my_snprintf(remote_error_buf, sizeof(remote_error_buf), "%s",
               mysql_error(mysql));
   DBUG_RETURN(HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM);
 }
@@ -2630,7 +2630,7 @@ bool ha_federated::get_error_message(int error, String* buf)
     buf->append("Error on remote system: ");
     buf->qs_append(remote_error_number);
     buf->append(": ");
-    buf->append(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE);
+    buf->append(remote_error_buf);
 
     remote_error_number= 0;
     remote_error_buf[0]= '\0';