Skip to content

Commit 8173c8c

Browse files
marcalffmarcalff
committed
Merge mysql-trunk --> mysql-trunk-wl5767
2 parents 7eb5956 + fa5b18e commit 8173c8c

File tree

162 files changed

+3174
-3128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+3174
-3128
lines changed

‎include/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by

‎include/m_ctype.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by

‎include/my_base.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by

‎include/my_bitmap.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by

‎include/my_global.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by

‎include/my_md5.h‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,36 @@
2222
* $FreeBSD: src/contrib/cvs/lib/md5.h,v 1.2 1999/12/11 15:10:02 peter Exp $
2323
*/
2424

25+
#if defined(HAVE_YASSL) || defined(HAVE_OPENSSL)
26+
/*
27+
Use MD5 implementation provided by the SSL libraries.
28+
*/
29+
30+
#if defined(HAVE_YASSL)
31+
32+
C_MODE_START
33+
34+
void my_md5_hash(char *digest, const char *buf, int len);
35+
36+
C_MODE_END
37+
38+
#else /* HAVE_YASSL */
39+
40+
#include <openssl/md5.h>
41+
42+
#define MY_MD5_HASH(digest, buf, len) \
43+
do { \
44+
MD5_CTX ctx; \
45+
MD5_Init (&ctx); \
46+
MD5_Update (&ctx, buf, len); \
47+
MD5_Final (digest, &ctx); \
48+
} while (0)
49+
50+
#endif /* HAVE_YASSL */
51+
52+
#else /* HAVE_YASSL || HAVE_OPENSSL */
53+
/* Fallback to the MySQL's implementation. */
54+
2555
/* Unlike previous versions of this code, uint32 need not be exactly
2656
32 bits, merely 32 bits or more. Choosing a data type which is 32
2757
bits instead of 64 is not important; speed is considerably more
@@ -35,18 +65,15 @@ typedef struct {
3565
unsigned char in[64];
3666
} my_MD5Context;
3767

38-
#ifdef __cplusplus
39-
extern "C" {
40-
#endif
68+
C_MODE_START
69+
4170
void my_MD5Init (my_MD5Context *context);
4271
void my_MD5Update (my_MD5Context *context,
4372
unsigned char const *buf, unsigned len);
4473
void my_MD5Final (unsigned char digest[16],
4574
my_MD5Context *context);
4675

47-
#ifdef __cplusplus
48-
}
49-
#endif
76+
C_MODE_END
5077

5178
#define MY_MD5_HASH(digest,buf,len) \
5279
do { \
@@ -56,4 +83,12 @@ do { \
5683
my_MD5Final (digest, &ctx); \
5784
} while (0)
5885

59-
#endif /* MY_MD__INCLUDED */
86+
#endif /* defined(HAVE_YASSL) || defined(HAVE_OPENSSL) */
87+
88+
C_MODE_START
89+
90+
void compute_md5_hash(char *digest, const char *buf, int len);
91+
92+
C_MODE_END
93+
94+
#endif /* MY_MD5_INCLUDED */

‎include/my_rnd.h‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#ifndef MY_RANDOM_INCLUDED
2+
#define MY_RANDOM_INCLUDED
3+
4+
/*
5+
Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
6+
7+
This program is free software; you can redistribute it and/or modify
8+
it under the terms of the GNU General Public License as published by
9+
the Free Software Foundation; version 2 of the License.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program; if not, write to the Free Software
18+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
19+
20+
/*
21+
A wrapper to use OpenSSL/YaSSL PRNGs.
22+
*/
23+
24+
#include <my_global.h>
25+
#include <mysql_com.h>
26+
#include <limits.h>
27+
28+
#ifdef __cplusplus
29+
extern "C" {
30+
#endif
31+
32+
double my_rnd_ssl(struct rand_struct *rand_st);
33+
34+
#ifdef __cplusplus
35+
}
36+
#endif
37+
38+
#endif /* MY_RANDOM_INCLUDED */

‎include/my_sys.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by

‎include/myisam.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by

‎include/mysql/psi/mysql_socket.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or
44
modify it under the terms of the GNU General Public License as

0 commit comments

Comments
 (0)