diff options
| -rw-r--r-- | client/mysqlmanager-pwgen.c | 2 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/my_md5.h (renamed from include/md5.h) | 0 | ||||
| -rw-r--r-- | mysys/md5.c | 2 | ||||
| -rw-r--r-- | os2/MySQL-Source.icc | 2 | ||||
| -rw-r--r-- | sql/item_strfunc.cc | 2 | ||||
| -rw-r--r-- | sql/table.cc | 2 | ||||
| -rw-r--r-- | tools/mysqlmanager.c | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c index 716a1e4bf4e..7a857c59743 100644 --- a/client/mysqlmanager-pwgen.c +++ b/client/mysqlmanager-pwgen.c @@ -22,7 +22,7 @@ #include <mysql_version.h> #include <errno.h> #include <my_getopt.h> -#include <md5.h> +#include "my_md5.h" const char* outfile=0,*user="root"; diff --git a/include/Makefile.am b/include/Makefile.am index ccd5ac627bf..2cd72052a15 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ mysys_err.h my_base.h help_start.h help_end.h \ my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ my_aes.h my_tree.h hash.h thr_alarm.h \ - thr_lock.h t_ctype.h violite.h md5.h base64.h \ + thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ mysql_version.h.in my_handler.h my_time.h \ my_user.h my_libwrap.h diff --git a/include/md5.h b/include/my_md5.h index f92976b3beb..f92976b3beb 100644 --- a/include/md5.h +++ b/include/my_md5.h diff --git a/mysys/md5.c b/mysys/md5.c index a88fb279a0b..0945f9ce5f4 100644 --- a/mysys/md5.c +++ b/mysys/md5.c @@ -45,7 +45,7 @@ documentation and/or software. #include <my_global.h> #include <m_string.h> -#include "md5.h" +#include "my_md5.h" /* Constants for MD5Transform routine. */ diff --git a/os2/MySQL-Source.icc b/os2/MySQL-Source.icc index 342cb6c96b9..285811d0eae 100644 --- a/os2/MySQL-Source.icc +++ b/os2/MySQL-Source.icc @@ -31,7 +31,7 @@ group server_global_pch = 'myisam.h', 'myisampack.h', '.\myisam\myisamdef.h', 'sql_string.h', 'item.h', 'unireg.h', 'field.h', 'sql_lex.h', 'sql_list.h', 'sql_repl.h', - 'md5.h', 'sql_acl.h', 'slave.h', + 'my_md5.h', 'sql_acl.h', 'slave.h', 'ha_myisam.h', 'procedure.h', 'sql_select.h', 'errmsg.h', 't_ctype.h', 'direct.h', 'mysys_err.h', 'zconf.h', 'zlib.h', diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 0c24f14c8fe..20a4b64640a 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -28,7 +28,7 @@ #ifdef HAVE_OPENSSL #include <openssl/des.h> #endif /* HAVE_OPENSSL */ -#include "md5.h" +#include "my_md5.h" #include "sha1.h" #include "my_aes.h" C_MODE_START diff --git a/sql/table.cc b/sql/table.cc index 9c3e7618aa0..f24f5c6fbcc 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -19,7 +19,7 @@ #include "mysql_priv.h" #include <errno.h> #include <m_ctype.h> -#include "md5.h" +#include "my_md5.h" /* Functions defined in this file */ 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> |