diff --git a/.bzrignore b/.bzrignore
index 2c20c4daf22..24ac6e22c45 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1121,3 +1121,5 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+support-files/MacOSX/postflight
+support-files/MacOSX/preflight
diff --git a/client/mysql.cc b/client/mysql.cc
index bee5376e036..04b634a47af 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -624,7 +624,7 @@ static struct my_option my_long_options[] =
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
-   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
+   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
    0},
   {"prompt", OPT_PROMPT, "Set the mysql prompt to this value.",
    (gptr*) &current_prompt, (gptr*) &current_prompt, 0, GET_STR_ALLOC,
diff --git a/configure.in b/configure.in
index aeb057509bf..e06f32f5e97 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- ksh -*-
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.57)dnl		Minimum Autoconf version required.
+AC_PREREQ(2.52)dnl		Minimum Autoconf version required.
 
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 23e4ccd0172..792d3c62169 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1863,8 +1863,8 @@ static void xid_free_hash (void *ptr)
 bool xid_cache_init()
 {
   pthread_mutex_init(&LOCK_xid_cache, MY_MUTEX_INIT_FAST);
-  hash_init(&xid_cache, &my_charset_bin, 100, 0, 0,
-            xid_get_hash_key, xid_free_hash, 0) != 0;
+  return hash_init(&xid_cache, &my_charset_bin, 100, 0, 0,
+                   xid_get_hash_key, xid_free_hash, 0) != 0;
 }
 
 void xid_cache_free()