diff --git a/.bzrignore b/.bzrignore
index 590515eabde..9db0b00c2a8 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -175,3 +175,5 @@ support-files/mysql.server
 support-files/mysql.spec
 tags
 libmysql_r/conf_to_src
+mysql-test/install_test_db
+mysql-test/mysql-test-run
diff --git a/include/global.h b/include/global.h
index 8796f3fc2b1..98c092acba1 100644
--- a/include/global.h
+++ b/include/global.h
@@ -479,6 +479,7 @@ extern double		my_atof(const char*);
 #undef HAVE_TEMPNAM				/* Use ours */
 #undef HAVE_PTHREAD_SETPRIO
 #undef HAVE_FTRUNCATE
+#undef HAVE_READLINK
 #endif
 
 /* This is from the old m-machine.h file */