MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:July 19 2007 12:14pm
Subject:bk commit into 5.0 tree (joerg:1.2532) BUG#14151
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-19 14:14:03+02:00, joerg@stripped +8 -0
  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.

  client/mysqlmanager-pwgen.c@stripped, 2007-07-19 14:13:01+02:00, joerg@stripped +1 -1
    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.

  include/Makefile.am@stripped, 2007-07-19 14:13:01+02:00, joerg@stripped +1 -1
    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.

  include/my_md5.h@stripped, 2007-07-19 14:00:45+02:00, joerg@stripped +0 -0
    Rename: include/md5.h -> include/my_md5.h

  mysys/md5.c@stripped, 2007-07-19 14:13:01+02:00, joerg@stripped +1 -1
    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.

  os2/MySQL-Source.icc@stripped, 2007-07-19 14:13:01+02:00, joerg@stripped +1 -1
    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.

  sql/item_strfunc.cc@stripped, 2007-07-19 14:13:01+02:00, joerg@stripped +1 -1
    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.

  sql/table.cc@stripped, 2007-07-19 14:13:01+02:00, joerg@stripped +1 -1
    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.

  tools/mysqlmanager.c@stripped, 2007-07-19 14:13:01+02:00, joerg@stripped +1 -1
    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.

diff -Nrup a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c
--- a/client/mysqlmanager-pwgen.c	2006-12-23 20:04:04 +01:00
+++ b/client/mysqlmanager-pwgen.c	2007-07-19 14:13:01 +02:00
@@ -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 -Nrup a/include/Makefile.am b/include/Makefile.am
--- a/include/Makefile.am	2007-04-26 16:06:40 +02:00
+++ b/include/Makefile.am	2007-07-19 14:13:01 +02:00
@@ -32,7 +32,7 @@ noinst_HEADERS =	config-win.h config-os2
 			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 -Nrup a/include/md5.h b/include/md5.h
--- a/include/md5.h	2006-12-23 20:04:04 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,92 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-
-/* MD5.H - header file for MD5C.C
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-/* GLOBAL.H - RSAREF types and constants
- */
-
-/* PROTOTYPES should be set to one if and only if the compiler supports
-  function argument prototyping.
-The following makes PROTOTYPES default to 0 if it has not already
-  been defined with C compiler flags.
- */
-
-/* egcs 1.1.2 under linux didn't defined it.... :( */
-
-#ifndef PROTOTYPES
-#define PROTOTYPES 1				/* Assume prototypes */
-#endif
-
-/* POINTER defines a generic pointer type */
-typedef unsigned char *POINTER;
-
-/* UINT2 defines a two byte word */
-typedef uint16 UINT2;				/* Fix for MySQL / Alpha */
-
-/* UINT4 defines a four byte word */
-typedef uint32 UINT4;				/* Fix for MySQL / Alpha */
-
-/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
-If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
-  returns an empty list.
- */
-#if PROTOTYPES
-#define PROTO_LIST(list) list
-#else
-#define PROTO_LIST(list) ()
-#endif
-/* MD5 context. */
-typedef struct {
-  UINT4 state[4];                                   /* state (ABCD) */
-  UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
-  unsigned char buffer[64];                         /* input buffer */
-} my_MD5_CTX;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-       void my_MD5Init PROTO_LIST ((my_MD5_CTX *));
-       void my_MD5Update PROTO_LIST
-         ((my_MD5_CTX *, unsigned char *, unsigned int));
-       void my_MD5Final PROTO_LIST ((unsigned char [16], my_MD5_CTX *));
-
-#ifdef __cplusplus
-}
-#endif
diff -Nrup a/include/my_md5.h b/include/my_md5.h
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/include/my_md5.h	2007-07-19 14:00:45 +02:00
@@ -0,0 +1,92 @@
+/* Copyright (C) 2000 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+
+/* MD5.H - header file for MD5C.C
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+/* GLOBAL.H - RSAREF types and constants
+ */
+
+/* PROTOTYPES should be set to one if and only if the compiler supports
+  function argument prototyping.
+The following makes PROTOTYPES default to 0 if it has not already
+  been defined with C compiler flags.
+ */
+
+/* egcs 1.1.2 under linux didn't defined it.... :( */
+
+#ifndef PROTOTYPES
+#define PROTOTYPES 1				/* Assume prototypes */
+#endif
+
+/* POINTER defines a generic pointer type */
+typedef unsigned char *POINTER;
+
+/* UINT2 defines a two byte word */
+typedef uint16 UINT2;				/* Fix for MySQL / Alpha */
+
+/* UINT4 defines a four byte word */
+typedef uint32 UINT4;				/* Fix for MySQL / Alpha */
+
+/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
+  returns an empty list.
+ */
+#if PROTOTYPES
+#define PROTO_LIST(list) list
+#else
+#define PROTO_LIST(list) ()
+#endif
+/* MD5 context. */
+typedef struct {
+  UINT4 state[4];                                   /* state (ABCD) */
+  UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
+  unsigned char buffer[64];                         /* input buffer */
+} my_MD5_CTX;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+       void my_MD5Init PROTO_LIST ((my_MD5_CTX *));
+       void my_MD5Update PROTO_LIST
+         ((my_MD5_CTX *, unsigned char *, unsigned int));
+       void my_MD5Final PROTO_LIST ((unsigned char [16], my_MD5_CTX *));
+
+#ifdef __cplusplus
+}
+#endif
diff -Nrup a/mysys/md5.c b/mysys/md5.c
--- a/mysys/md5.c	2006-12-23 20:04:07 +01:00
+++ b/mysys/md5.c	2007-07-19 14:13:01 +02:00
@@ -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 -Nrup a/os2/MySQL-Source.icc b/os2/MySQL-Source.icc
--- a/os2/MySQL-Source.icc	2005-09-29 03:05:42 +02:00
+++ b/os2/MySQL-Source.icc	2007-07-19 14:13:01 +02:00
@@ -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 -Nrup a/sql/item_strfunc.cc b/sql/item_strfunc.cc
--- a/sql/item_strfunc.cc	2007-06-17 20:23:18 +02:00
+++ b/sql/item_strfunc.cc	2007-07-19 14:13:01 +02:00
@@ -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 -Nrup a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2007-07-12 20:26:39 +02:00
+++ b/sql/table.cc	2007-07-19 14:13:01 +02:00
@@ -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 -Nrup a/tools/mysqlmanager.c b/tools/mysqlmanager.c
--- a/tools/mysqlmanager.c	2007-02-22 15:59:56 +01:00
+++ b/tools/mysqlmanager.c	2007-07-19 14:13:01 +02:00
@@ -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>
Thread
bk commit into 5.0 tree (joerg:1.2532) BUG#14151Joerg Bruehe19 Jul