summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorjoerg@trift-lap.none <>2007-07-19 14:14:03 +0200
committerjoerg@trift-lap.none <>2007-07-19 14:14:03 +0200
commitaf3c675bc1176aef4d7f1070a80c49b987e54d6e (patch)
tree384b50aefabe8834cf34958a95feda6e244a1ff2 /tools
parentaa03d369bff132c2c00bf7de9902792f0eaf5b5e (diff)
downloadmariadb-git-af3c675bc1176aef4d7f1070a80c49b987e54d6e.tar.gz
Avoid the name conflict between the system-provided "md5.h" and the MySQL one
by renaming "include/md5.h" to "include/my_md5.h". Fixes bug#14151.
Diffstat (limited to 'tools')
-rw-r--r--tools/mysqlmanager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index f952a5806b4..faed9addf60 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -37,7 +37,7 @@
#include <sys/stat.h>
#include <errno.h>
#include <violite.h>
-#include <md5.h>
+#include "my_md5.h"
#include <signal.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>