Merge trift-lap.none:/MySQL/M50/bug14151-5.0

into  trift-lap.none:/MySQL/M50/push-5.0

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";
 

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
 

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. */
 

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',

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

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 */
 

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>