summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2000-12-13 16:43:18 -0700
committersasha@mysql.sashanet.com <>2000-12-13 16:43:18 -0700
commit9a5ce4d513cb4c70d1ba81d5bdda4decb52041b7 (patch)
tree0f4c10c2f576aedfdf9937c32c8285222b45b343
parent8502addd5f3651bd4efddf7b08c39e1d4d8ca264 (diff)
downloadmariadb-git-9a5ce4d513cb4c70d1ba81d5bdda4decb52041b7.tar.gz
MIT fix
-rw-r--r--.bzrignore2
-rw-r--r--include/global.h1
2 files changed, 3 insertions, 0 deletions
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 */