View | Details | Raw Unified | Return to bug 241533
Collapse All | Expand All

(-)Makefile (-2 / +3 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mysqlwsrep
4
PORTNAME=	mysqlwsrep
5
PORTVERSION?=	5.6.45
5
PORTVERSION?=	5.6.46
6
DISTVERSIONPREFIX?=	wsrep_
6
DISTVERSIONPREFIX?=	wsrep_
7
DISTVERSIONSUFFIX?=	-25.27
7
DISTVERSIONSUFFIX?=	-25.28
8
PORTREVISION?=	1
8
PORTREVISION?=	1
9
CATEGORIES=	databases
9
CATEGORIES=	databases
10
PKGNAMESUFFIX=	56-server
10
PKGNAMESUFFIX=	56-server
Lines 80-85 Link Here
80
		-DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
80
		-DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
81
		-DINSTALL_MYSQLTESTDIR=0 \
81
		-DINSTALL_MYSQLTESTDIR=0 \
82
		-DWITH_LIBWRAP=1 \
82
		-DWITH_LIBWRAP=1 \
83
		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
83
		-DWITH_WSREP=1
84
		-DWITH_WSREP=1
84
85
85
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh scripts/wsrep_sst_*
86
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh scripts/wsrep_sst_*
(-)distinfo (-3 / +3 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1567524448
1
TIMESTAMP = 1571904979
2
SHA256 (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 670c622644a9a271db810b193eb7eea3693b5ec6e25c38a26e22cd1f4e551d73
2
SHA256 (codership-mysql-wsrep-wsrep_5.6.46-25.28_GH0.tar.gz) = b15b3ffdc357fec52f2a03be30164879ae69739755c8f61a7c99e6bc7046f02f
3
SIZE (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 32782117
3
SIZE (codership-mysql-wsrep-wsrep_5.6.46-25.28_GH0.tar.gz) = 32659765
4
SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
4
SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
5
SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
5
SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
(-)files/patch-CMakeLists.txt (-7 / +7 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
1
--- CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -532,12 +532,10 @@ IF(UNIX)
3
@@ -568,12 +568,10 @@ IF(UNIX)
4
 ENDIF()
4
 ENDIF()
5
 
5
 
6
 IF(NOT WITHOUT_SERVER)
6
 IF(NOT WITHOUT_SERVER)
Lines 13-19 Link Here
13
   ENDIF(WITH_EMBEDDED_SERVER)
13
   ENDIF(WITH_EMBEDDED_SERVER)
14
 ENDIF()
14
 ENDIF()
15
 
15
 
16
@@ -546,10 +544,7 @@ ENDIF()
16
@@ -582,10 +580,7 @@ ENDIF()
17
 ADD_SUBDIRECTORY(scripts)
17
 ADD_SUBDIRECTORY(scripts)
18
 
18
 
19
 IF(NOT WITHOUT_SERVER)
19
 IF(NOT WITHOUT_SERVER)
Lines 24-38 Link Here
24
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
24
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
25
     ADD_SUBDIRECTORY(internal)
25
     ADD_SUBDIRECTORY(internal)
26
   ENDIF()
26
   ENDIF()
27
@@ -608,6 +603,7 @@ ENDIF()
27
@@ -644,6 +639,7 @@ ENDIF()
28
 #
28
 #
29
 # RPM installs documentation directly from the source tree
29
 # RPM installs documentation directly from the source tree
30
 #
30
 #
31
+IF(FALSE)
31
+IF(FALSE)
32
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
32
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
33
   INSTALL(FILES COPYING LICENSE.mysql 
33
   INSTALL(FILES
34
   DESTINATION ${INSTALL_DOCREADMEDIR} 
34
     README
35
@@ -630,6 +626,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
35
@@ -664,6 +660,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
36
     PATTERN "mysql.info" EXCLUDE
36
     PATTERN "mysql.info" EXCLUDE
37
     PATTERN "sp-imp-spec.txt" EXCLUDE
37
     PATTERN "sp-imp-spec.txt" EXCLUDE
38
   )
38
   )
(-)files/patch-PR225888.diff (-286 lines)
Lines 1-286 Link Here
1
--- extra/yassl/include/openssl/ssl.h.orig	2019-07-16 14:08:43 UTC
2
+++ extra/yassl/include/openssl/ssl.h
3
@@ -1,5 +1,5 @@
4
 /*
5
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
6
+   Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
7
 
8
    This program is free software; you can redistribute it and/or modify
9
    it under the terms of the GNU General Public License as published by
10
@@ -179,7 +179,7 @@ enum { /* X509 Constants */
11
 unsigned long ERR_get_error_line_data(const char**, int*, const char**, int *);
12
 void          ERR_print_errors_fp(FILE*);
13
 char*         ERR_error_string(unsigned long,char*);
14
-void          ERR_remove_state(unsigned long);
15
+void          ERR_remove_thread_state(const void *);
16
 unsigned long ERR_get_error(void);
17
 unsigned long ERR_peek_error(void);
18
 int           ERR_GET_REASON(int);
19
--- extra/yassl/src/ssl.cpp.orig	2019-07-16 14:08:43 UTC
20
+++ extra/yassl/src/ssl.cpp
21
@@ -1,5 +1,5 @@
22
 /*
23
-   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
24
+   Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
25
 
26
    This program is free software; you can redistribute it and/or modify
27
    it under the terms of the GNU General Public License as published by
28
@@ -1516,7 +1516,7 @@ int SSLeay_add_ssl_algorithms()  // compatibility only
29
 }
30
 
31
 
32
-void ERR_remove_state(unsigned long)
33
+void ERR_remove_thread_state(const void *)
34
 {
35
     GetErrors().Remove();
36
 }
37
--- mysys_ssl/my_aes_openssl.cc.orig	2019-07-16 14:08:43 UTC
38
+++ mysys_ssl/my_aes_openssl.cc
39
@@ -1,4 +1,4 @@
40
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
41
+/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
42
 
43
 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
45
@@ -108,33 +108,46 @@ int my_aes_encrypt(const unsigned char *source, uint32
46
                    const unsigned char *key, uint32 key_length,
47
                    enum my_aes_opmode mode, const unsigned char *iv)
48
 {
49
-  EVP_CIPHER_CTX ctx;
50
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
51
+  EVP_CIPHER_CTX stack_ctx;
52
+  EVP_CIPHER_CTX *ctx= &stack_ctx;
53
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
54
+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
55
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
56
   const EVP_CIPHER *cipher= aes_evp_type(mode);
57
   int u_len, f_len;
58
   /* The real key to be used for encryption */
59
   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
60
   my_aes_create_key(key, key_length, rkey, mode);
61
 
62
-  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
63
+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
64
     return MY_AES_BAD_DATA;
65
 
66
-  if (!EVP_EncryptInit(&ctx, cipher, rkey, iv))
67
+  if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
68
     goto aes_error;                             /* Error */
69
-  if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
70
+  if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
71
     goto aes_error;                             /* Error */
72
-  if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length))
73
+  if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length))
74
     goto aes_error;                             /* Error */
75
 
76
-  if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len))
77
+  if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
78
     goto aes_error;                             /* Error */
79
 
80
-  EVP_CIPHER_CTX_cleanup(&ctx);
81
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
82
+  EVP_CIPHER_CTX_cleanup(ctx);
83
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
84
+  EVP_CIPHER_CTX_free(ctx);
85
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
86
   return u_len + f_len;
87
 
88
 aes_error:
89
   /* need to explicitly clean up the error if we want to ignore it */
90
   ERR_clear_error();
91
-  EVP_CIPHER_CTX_cleanup(&ctx);
92
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
93
+    EVP_CIPHER_CTX_cleanup(ctx);
94
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
95
+    EVP_CIPHER_CTX_free(ctx);
96
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
97
   return MY_AES_BAD_DATA;
98
 }
99
 
100
@@ -145,7 +158,12 @@ int my_aes_decrypt(const unsigned char *source, uint32
101
                    enum my_aes_opmode mode, const unsigned char *iv)
102
 {
103
 
104
-  EVP_CIPHER_CTX ctx;
105
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
106
+  EVP_CIPHER_CTX stack_ctx;
107
+  EVP_CIPHER_CTX *ctx= &stack_ctx;
108
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
109
+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
110
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
111
   const EVP_CIPHER *cipher= aes_evp_type(mode);
112
   int u_len, f_len;
113
 
114
@@ -153,27 +171,34 @@ int my_aes_decrypt(const unsigned char *source, uint32
115
   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
116
 
117
   my_aes_create_key(key, key_length, rkey, mode);
118
-  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
119
+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
120
     return MY_AES_BAD_DATA;
121
 
122
-  EVP_CIPHER_CTX_init(&ctx);
123
-
124
-  if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv))
125
+  if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
126
     goto aes_error;                             /* Error */
127
-  if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
128
+  if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
129
     goto aes_error;                             /* Error */
130
-  if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length))
131
+  if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length))
132
     goto aes_error;                             /* Error */
133
-  if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len))
134
+  if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
135
     goto aes_error;                             /* Error */
136
 
137
-  EVP_CIPHER_CTX_cleanup(&ctx);
138
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
139
+  EVP_CIPHER_CTX_cleanup(ctx);
140
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
141
+  EVP_CIPHER_CTX_free(ctx);
142
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
143
+
144
   return u_len + f_len;
145
 
146
 aes_error:
147
   /* need to explicitly clean up the error if we want to ignore it */
148
   ERR_clear_error();
149
-  EVP_CIPHER_CTX_cleanup(&ctx);
150
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
151
+  EVP_CIPHER_CTX_cleanup(ctx);
152
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
153
+  EVP_CIPHER_CTX_free(ctx);
154
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
155
   return MY_AES_BAD_DATA;
156
 }
157
 
158
--- sql-common/client.c.orig	2019-07-16 14:08:43 UTC
159
+++ sql-common/client.c
160
@@ -1968,7 +1968,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
161
     goto error;
162
   }
163
 
164
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
165
   cn= (char *) ASN1_STRING_data(cn_asn1);
166
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
167
+  cn= (char *) ASN1_STRING_get0_data(cn_asn1);
168
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
169
 
170
   // There should not be any NULL embedded in the CN
171
   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
172
--- sql/mysqld.cc.orig	2019-07-16 14:08:43 UTC
173
+++ sql/mysqld.cc
174
@@ -4511,7 +4511,11 @@ static int init_ssl()
175
 {
176
 #ifdef HAVE_OPENSSL
177
 #ifndef HAVE_YASSL
178
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
179
   CRYPTO_malloc_init();
180
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
181
+  OPENSSL_malloc_init();
182
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
183
 #endif
184
   ssl_start();
185
 #ifndef EMBEDDED_LIBRARY
186
@@ -4525,7 +4529,9 @@ static int init_ssl()
187
 					  opt_ssl_cipher, &error,
188
                                           opt_ssl_crl, opt_ssl_crlpath);
189
     DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
190
-    ERR_remove_state(0);
191
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
192
+    ERR_remove_thread_state(0);
193
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
194
     if (!ssl_acceptor_fd)
195
     {
196
       sql_print_warning("Failed to setup SSL");
197
--- sql/rpl_slave.cc.orig	2019-07-16 14:08:43 UTC
198
+++ sql/rpl_slave.cc
199
@@ -5258,7 +5258,9 @@ err:
200
   mysql_mutex_unlock(&mi->run_lock);
201
   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
202
   my_thread_end();
203
-  ERR_remove_state(0);
204
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
205
+  ERR_remove_thread_state(0);
206
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
207
   pthread_exit(0);
208
   return(0);                                    // Avoid compiler warnings
209
 }
210
@@ -5449,7 +5451,9 @@ err:
211
   }
212
 
213
   my_thread_end();
214
-  ERR_remove_state(0);
215
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
216
+  ERR_remove_thread_state(0);
217
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
218
   pthread_exit(0);
219
   DBUG_RETURN(0); 
220
 }
221
@@ -6663,7 +6667,9 @@ log '%s' at position %s, relay log '%s' position: %s",
222
 
223
   DBUG_LEAVE;                            // Must match DBUG_ENTER()
224
   my_thread_end();
225
-  ERR_remove_state(0);
226
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
227
+  ERR_remove_thread_state(0);
228
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
229
   pthread_exit(0);
230
   return 0;                             // Avoid compiler warnings
231
 }
232
--- vio/viossl.c.orig	2019-07-16 14:08:43 UTC
233
+++ vio/viossl.c
234
@@ -1,4 +1,4 @@
235
-/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
236
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
237
 
238
    This program is free software; you can redistribute it and/or modify
239
    it under the terms of the GNU General Public License as published by
240
@@ -415,7 +415,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
241
       for (j = 0; j < n; j++)
242
       {
243
         SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
244
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
245
         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
246
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
247
+        DBUG_PRINT("info", ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
248
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
249
       }
250
   }
251
 #endif
252
--- vio/viosslfactories.c.orig	2019-07-16 14:08:43 UTC
253
+++ vio/viosslfactories.c
254
@@ -1,4 +1,4 @@
255
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
256
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
257
 
258
    This program is free software; you can redistribute it and/or modify
259
    it under the terms of the GNU General Public License as published by
260
@@ -68,13 +68,21 @@ static DH *get_dh2048(void)
261
   DH *dh;
262
   if ((dh=DH_new()))
263
   {
264
-    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
265
-    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
266
-    if (! dh->p || ! dh->g)
267
-    {
268
+    BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
269
+    BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
270
+    if (!p || !g
271
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
272
+        || !DH_set0_pqg(dh, p, NULL, g)
273
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
274
+    ) {
275
+      /* DH_free() will free 'p' and 'g' at once. */
276
       DH_free(dh);
277
-      dh=0;
278
+      return NULL;
279
     }
280
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
281
+    dh->p= p;
282
+    dh->g= g;
283
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
284
   }
285
   return(dh);
286
 }
(-)files/patch-client_CMakeLists.txt (-6 / +6 lines)
Lines 1-8 Link Here
1
--- client/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
1
--- client/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ client/CMakeLists.txt
2
+++ client/CMakeLists.txt
3
@@ -30,17 +30,20 @@ INCLUDE_DIRECTORIES(
3
@@ -34,17 +34,20 @@ INCLUDE_DIRECTORIES(
4
 COPY_OPENSSL_DLLS(copy_openssl_client)
5
 
4
 
5
 
6
 ADD_DEFINITIONS(${SSL_DEFINES})
6
 ADD_DEFINITIONS(${SSL_DEFINES})
7
+IF(FALSE)
7
+IF(FALSE)
8
 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
8
 MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
Lines 21-27 Link Here
21
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
21
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
22
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
22
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
23
 
23
 
24
@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
24
@@ -54,17 +57,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
25
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
25
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
26
 SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
26
 SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
27
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
27
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
Lines 43-49 Link Here
43
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
43
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
44
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
44
 TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
45
 
45
 
46
@@ -73,6 +80,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
46
@@ -77,6 +84,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
47
 
47
 
48
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
48
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
49
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
49
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
Lines 51-57 Link Here
51
 
51
 
52
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
52
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
53
 IF(WIN32)
53
 IF(WIN32)
54
@@ -82,11 +90,6 @@ ENDIF(WIN32)
54
@@ -86,11 +94,6 @@ ENDIF(WIN32)
55
 SET_TARGET_PROPERTIES (
55
 SET_TARGET_PROPERTIES (
56
   mysql_plugin 
56
   mysql_plugin 
57
   mysql_upgrade
57
   mysql_upgrade
(-)files/patch-cmake_plugin.cmake (-2 / +2 lines)
Lines 1-6 Link Here
1
--- cmake/plugin.cmake.orig	2019-07-16 14:08:43 UTC
1
--- cmake/plugin.cmake.orig	2019-10-21 05:17:49 UTC
2
+++ cmake/plugin.cmake
2
+++ cmake/plugin.cmake
3
@@ -216,9 +216,6 @@ MACRO(MYSQL_ADD_PLUGIN)
3
@@ -223,9 +223,6 @@ MACRO(MYSQL_ADD_PLUGIN)
4
       MYSQL_INSTALL_TARGETS(${target}
4
       MYSQL_INSTALL_TARGETS(${target}
5
         DESTINATION ${INSTALL_PLUGINDIR}
5
         DESTINATION ${INSTALL_PLUGINDIR}
6
         COMPONENT ${INSTALL_COMPONENT})
6
         COMPONENT ${INSTALL_COMPONENT})
(-)files/patch-cmake_ssl.cmake (-2 / +2 lines)
Lines 1-6 Link Here
1
--- cmake/ssl.cmake.orig	2017-01-25 07:58:07 UTC
1
--- cmake/ssl.cmake.orig	2019-10-21 05:17:49 UTC
2
+++ cmake/ssl.cmake
2
+++ cmake/ssl.cmake
3
@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL)
3
@@ -195,7 +195,7 @@ MACRO (MYSQL_CHECK_SSL)
4
     IF(OPENSSL_INCLUDE_DIR AND
4
     IF(OPENSSL_INCLUDE_DIR AND
5
        OPENSSL_LIBRARY   AND
5
        OPENSSL_LIBRARY   AND
6
        CRYPTO_LIBRARY      AND
6
        CRYPTO_LIBRARY      AND
(-)files/patch-extra_CMakeLists.txt (-2 / +2 lines)
Lines 1-6 Link Here
1
--- extra/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
1
--- extra/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ extra/CMakeLists.txt
2
+++ extra/CMakeLists.txt
3
@@ -101,8 +101,10 @@ IF(UNIX)
3
@@ -100,8 +100,10 @@ IF(UNIX)
4
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
4
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
5
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
5
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
6
 
6
 
(-)files/patch-include_CMakeLists.txt (-2 / +2 lines)
Lines 1-6 Link Here
1
--- include/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
1
--- include/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ include/CMakeLists.txt
2
+++ include/CMakeLists.txt
3
@@ -65,10 +65,12 @@ SET(HEADERS 
3
@@ -72,10 +72,12 @@ SET(HEADERS 
4
   ${HEADERS_GEN_CONFIGURE}
4
   ${HEADERS_GEN_CONFIGURE}
5
 )
5
 )
6
 
6
 
(-)files/patch-include_my__compare.h (-2 / +2 lines)
Lines 1-6 Link Here
1
--- include/my_compare.h.orig	2019-07-16 14:08:43 UTC
1
--- include/my_compare.h.orig	2019-10-21 05:17:49 UTC
2
+++ include/my_compare.h
2
+++ include/my_compare.h
3
@@ -39,7 +39,7 @@ extern "C" {
3
@@ -46,7 +46,7 @@ extern "C" {
4
   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
4
   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
5
 */
5
 */
6
 
6
 
(-)files/patch-include_myisam.h (-2 / +2 lines)
Lines 1-6 Link Here
1
--- include/myisam.h.orig	2017-01-25 07:58:07 UTC
1
--- include/myisam.h.orig	2019-10-21 05:17:49 UTC
2
+++ include/myisam.h
2
+++ include/myisam.h
3
@@ -49,7 +49,7 @@ extern "C" {
3
@@ -56,7 +56,7 @@ extern "C" {
4
   The following defines can be increased if necessary.
4
   The following defines can be increased if necessary.
5
   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
5
   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
6
 */
6
 */
(-)files/patch-libmysql_CMakeLists.txt (-11 / +11 lines)
Lines 1-19 Link Here
1
--- libmysql/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
1
--- libmysql/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ libmysql/CMakeLists.txt
2
+++ libmysql/CMakeLists.txt
3
@@ -180,7 +180,7 @@ IF(WIN32)
3
@@ -205,7 +205,7 @@ IF(WIN32)
4
 ENDIF()
4
 ENDIF()
5
 
5
 
6
 # Merge several convenience libraries into one big mysqlclient
6
 # Merge several convenience libraries into one big mysqlclient
7
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
7
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
8
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
8
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
9
 TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
9
 
10
 
10
 # Visual Studio users need debug  static library for debug projects
11
 # Visual Studio users need debug  static library for debug projects
11
 IF(MSVC)
12
@@ -234,19 +234,22 @@ IF(UNIX)
12
@@ -208,19 +208,22 @@ IF(UNIX)
13
   ENDMACRO()
13
   ENDMACRO()
14
 ENDIF()
14
 ENDIF()
15
 
15
 
16
+IF(FALSE)
16
+IF (FALSE)
17
 IF(UNIX)
17
 IF(UNIX)
18
   GET_TARGET_NAME(mysqlclient lib_name)
18
   GET_TARGET_NAME(mysqlclient lib_name)
19
   INSTALL_SYMLINK(mysqlclient
19
   INSTALL_SYMLINK(mysqlclient
Lines 25-39 Link Here
25
 IF(NOT DISABLE_SHARED)
25
 IF(NOT DISABLE_SHARED)
26
   # Merge several convenience libraries into one big mysqlclient
26
   # Merge several convenience libraries into one big mysqlclient
27
   # and link them together into shared library.
27
   # and link them together into shared library.
28
   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
28
   MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
29
     EXPORTS ${CLIENT_API_FUNCTIONS}
29
     EXPORTS ${CLIENT_API_FUNCTIONS}
30
-    COMPONENT SharedLibraries)
30
-    COMPONENT SharedLibraries)
31
+    COMPONENT SharedLibraries NOINSTALL)
31
+    COMPONENT SharedLibraries NOINSTALL)
32
+ IF(FALSE)
32
+  IF (FALSE)
33
   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
33
   IF(UNIX)
34
   IF(UNIX)
34
     # libtool compatability
35
     # libtool compatability
35
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
36
@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
36
@@ -289,4 +292,5 @@ IF(NOT DISABLE_SHARED)
37
         ${INSTALL_LIBDIR} SharedLibraries)
37
         ${INSTALL_LIBDIR} SharedLibraries)
38
     ENDFOREACH()
38
     ENDFOREACH()
39
   ENDIF()
39
   ENDIF()
(-)files/patch-libservices_CMakeLists.txt (-2 / +2 lines)
Lines 1-6 Link Here
1
--- libservices/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
1
--- libservices/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ libservices/CMakeLists.txt
2
+++ libservices/CMakeLists.txt
3
@@ -24,4 +24,6 @@ SET(MYSQLSERVICES_SOURCES
3
@@ -31,4 +31,6 @@ SET(MYSQLSERVICES_SOURCES
4
   mysql_string_service.c)
4
   mysql_string_service.c)
5
 
5
 
6
 ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
6
 ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
(-)files/patch-man_CMakeLists.txt (-2 / +2 lines)
Lines 1-6 Link Here
1
--- man/CMakeLists.txt.orig	2017-01-25 07:58:07 UTC
1
--- man/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ man/CMakeLists.txt
2
+++ man/CMakeLists.txt
3
@@ -14,9 +14,7 @@
3
@@ -21,9 +21,7 @@
4
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
4
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
5
 
5
 
6
 # Copy man pages
6
 # Copy man pages
(-)files/patch-mysys__ssl_my__default.cc (-6 / +6 lines)
Lines 1-6 Link Here
1
--- mysys_ssl/my_default.cc.orig	2019-07-16 14:08:43 UTC
1
--- mysys_ssl/my_default.cc.orig	2019-10-21 05:17:49 UTC
2
+++ mysys_ssl/my_default.cc
2
+++ mysys_ssl/my_default.cc
3
@@ -116,7 +116,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
3
@@ -128,7 +128,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
4
 #endif /* WITH_WREP */
4
 #endif /* WITH_WREP */
5
 /* Which directories are searched for options (and in which order) */
5
 /* Which directories are searched for options (and in which order) */
6
 
6
 
Lines 9-15 Link Here
9
 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
9
 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
10
 static const char **default_directories = NULL;
10
 static const char **default_directories = NULL;
11
 
11
 
12
@@ -921,6 +921,14 @@ static int search_default_file_with_ext(Process_option
12
@@ -933,6 +933,14 @@ static int search_default_file_with_ext(Process_option
13
     strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
13
     strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
14
 #endif /* WITH_WSREP */
14
 #endif /* WITH_WSREP */
15
 
15
 
Lines 24-30 Link Here
24
   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
24
   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
25
   {
25
   {
26
     line++;
26
     line++;
27
@@ -1259,7 +1267,8 @@ void my_print_default_files(const char *conf_file)
27
@@ -1271,7 +1279,8 @@ void my_print_default_files(const char *conf_file)
28
             end[(strlen(end)-1)] = ' ';
28
             end[(strlen(end)-1)] = ' ';
29
           else
29
           else
30
             strxmov(end, conf_file, *ext , " ",  NullS);
30
             strxmov(end, conf_file, *ext , " ",  NullS);
Lines 34-40 Link Here
34
         }
34
         }
35
       }
35
       }
36
     }
36
     }
37
@@ -1418,14 +1427,9 @@ static const char **init_default_directories(MEM_ROOT 
37
@@ -1430,14 +1439,9 @@ static const char **init_default_directories(MEM_ROOT 
38
 
38
 
39
 #else
39
 #else
40
 
40
 
Lines 51-57 Link Here
51
 #endif
51
 #endif
52
 
52
 
53
   if ((env= getenv("MYSQL_HOME")))
53
   if ((env= getenv("MYSQL_HOME")))
54
@@ -1495,7 +1499,7 @@ int check_file_permissions(const char *file_name, my_b
54
@@ -1507,7 +1511,7 @@ int check_file_permissions(const char *file_name, my_b
55
   MY_STAT stat_info;
55
   MY_STAT stat_info;
56
 
56
 
57
   if (!my_stat(file_name,&stat_info,MYF(0)))
57
   if (!my_stat(file_name,&stat_info,MYF(0)))
(-)files/patch-plugin_password__validation_validate__password.cc (-2 / +2 lines)
Lines 1-6 Link Here
1
--- plugin/password_validation/validate_password.cc.orig	2019-07-16 14:08:43 UTC
1
--- plugin/password_validation/validate_password.cc.orig	2019-10-21 05:17:49 UTC
2
+++ plugin/password_validation/validate_password.cc
2
+++ plugin/password_validation/validate_password.cc
3
@@ -16,6 +16,8 @@
3
@@ -23,6 +23,8 @@
4
 #include <my_sys.h>
4
 #include <my_sys.h>
5
 #include <string>
5
 #include <string>
6
 #include <mysql/plugin_validate_password.h>
6
 #include <mysql/plugin_validate_password.h>
(-)files/patch-scripts_CMakeLists.txt (-4 / +4 lines)
Lines 1-6 Link Here
1
--- scripts/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
1
--- scripts/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ scripts/CMakeLists.txt
2
+++ scripts/CMakeLists.txt
3
@@ -304,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
3
@@ -311,6 +311,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
4
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
4
           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
5
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
5
           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
6
           SET(${var} "${${var}}-l${lib} " ) 
6
           SET(${var} "${${var}}-l${lib} " ) 
Lines 9-15 Link Here
9
         ELSE()
9
         ELSE()
10
           SET(${var} "${${var}}-l${lib} " ) 
10
           SET(${var} "${${var}}-l${lib} " ) 
11
         ENDIF()
11
         ENDIF()
12
@@ -366,15 +368,10 @@ ELSE()
12
@@ -373,15 +375,10 @@ ELSE()
13
   # On Unix, most of the files end up in the bin directory
13
   # On Unix, most of the files end up in the bin directory
14
   SET(mysql_config_COMPONENT COMPONENT Development)
14
   SET(mysql_config_COMPONENT COMPONENT Development)
15
   SET(BIN_SCRIPTS
15
   SET(BIN_SCRIPTS
Lines 25-31 Link Here
25
     mysqlhotcopy
25
     mysqlhotcopy
26
     mysqldumpslow
26
     mysqldumpslow
27
     mysqld_multi
27
     mysqld_multi
28
@@ -384,7 +381,7 @@ ELSE()
28
@@ -391,7 +388,7 @@ ELSE()
29
   FOREACH(file ${BIN_SCRIPTS})
29
   FOREACH(file ${BIN_SCRIPTS})
30
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
30
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
31
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
31
       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
(-)files/patch-sql_CMakeLists.txt (-5 / +5 lines)
Lines 1-6 Link Here
1
--- sql/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
1
--- sql/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ sql/CMakeLists.txt
2
+++ sql/CMakeLists.txt
3
@@ -435,7 +435,7 @@ ADD_CUSTOM_TARGET( 
3
@@ -442,7 +442,7 @@ ADD_CUSTOM_TARGET( 
4
         DEPENDS ${GEN_DIGEST_SOURCES}
4
         DEPENDS ${GEN_DIGEST_SOURCES}
5
 )
5
 )
6
 
6
 
Lines 9-15 Link Here
9
 MYSQL_ADD_PLUGIN(udf_example udf_example.cc
9
 MYSQL_ADD_PLUGIN(udf_example udf_example.cc
10
                  MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
10
                  MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
11
 IF(NOT DISABLE_SHARED)
11
 IF(NOT DISABLE_SHARED)
12
@@ -445,6 +445,7 @@ IF(NOT DISABLE_SHARED)
12
@@ -452,6 +452,7 @@ IF(NOT DISABLE_SHARED)
13
       "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
13
       "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
14
   ENDIF()
14
   ENDIF()
15
 ENDIF()
15
 ENDIF()
Lines 17-23 Link Here
17
 
17
 
18
 FOREACH(tool gtar tar git)
18
 FOREACH(tool gtar tar git)
19
   STRING(TOUPPER ${tool}  TOOL)
19
   STRING(TOUPPER ${tool}  TOOL)
20
@@ -470,6 +471,7 @@ ADD_CUSTOM_TARGET(distclean
20
@@ -477,6 +478,7 @@ ADD_CUSTOM_TARGET(distclean
21
 
21
 
22
 IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
22
 IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
23
 
23
 
Lines 25-31 Link Here
25
 # Copy db.opt into data/test/
25
 # Copy db.opt into data/test/
26
 SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
26
 SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
27
 INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
27
 INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
28
@@ -512,6 +514,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
28
@@ -519,6 +521,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
29
 ELSE()
29
 ELSE()
30
   # Not windows or cross compiling, just install an empty directory
30
   # Not windows or cross compiling, just install an empty directory
31
   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
31
   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
(-)files/patch-sql_sys__vars.cc (-5 / +5 lines)
Lines 1-6 Link Here
1
--- sql/sys_vars.cc.orig	2019-07-16 14:08:43 UTC
1
--- sql/sys_vars.cc.orig	2019-10-21 05:17:49 UTC
2
+++ sql/sys_vars.cc
2
+++ sql/sys_vars.cc
3
@@ -1415,7 +1415,7 @@ static Sys_var_ulong Sys_interactive_timeout(
3
@@ -1422,7 +1422,7 @@ static Sys_var_ulong Sys_interactive_timeout(
4
        "connection before closing it",
4
        "connection before closing it",
5
        SESSION_VAR(net_interactive_timeout),
5
        SESSION_VAR(net_interactive_timeout),
6
        CMD_LINE(REQUIRED_ARG),
6
        CMD_LINE(REQUIRED_ARG),
Lines 9-15 Link Here
9
 
9
 
10
 static Sys_var_ulong Sys_join_buffer_size(
10
 static Sys_var_ulong Sys_join_buffer_size(
11
        "join_buffer_size",
11
        "join_buffer_size",
12
@@ -2034,7 +2034,7 @@ static Sys_var_ulong Sys_net_read_timeout(
12
@@ -2041,7 +2041,7 @@ static Sys_var_ulong Sys_net_read_timeout(
13
        "Number of seconds to wait for more data from a connection before "
13
        "Number of seconds to wait for more data from a connection before "
14
        "aborting the read",
14
        "aborting the read",
15
        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
15
        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
Lines 18-24 Link Here
18
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
18
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
19
        ON_UPDATE(fix_net_read_timeout));
19
        ON_UPDATE(fix_net_read_timeout));
20
 
20
 
21
@@ -2049,7 +2049,7 @@ static Sys_var_ulong Sys_net_write_timeout(
21
@@ -2056,7 +2056,7 @@ static Sys_var_ulong Sys_net_write_timeout(
22
        "Number of seconds to wait for a block to be written to a connection "
22
        "Number of seconds to wait for a block to be written to a connection "
23
        "before aborting the write",
23
        "before aborting the write",
24
        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
24
        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
Lines 27-33 Link Here
27
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
27
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
28
        ON_UPDATE(fix_net_write_timeout));
28
        ON_UPDATE(fix_net_write_timeout));
29
 
29
 
30
@@ -3182,7 +3182,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
30
@@ -3189,7 +3189,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
31
        "The number of seconds the server waits for activity on a "
31
        "The number of seconds the server waits for activity on a "
32
        "connection before closing it",
32
        "connection before closing it",
33
        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
33
        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
(-)files/patch-support-files_CMakeLists.txt (-2 / +2 lines)
Lines 1-6 Link Here
1
--- support-files/CMakeLists.txt.orig	2019-07-16 14:08:43 UTC
1
--- support-files/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
2
+++ support-files/CMakeLists.txt
2
+++ support-files/CMakeLists.txt
3
@@ -74,7 +74,9 @@ IF(UNIX)
3
@@ -81,7 +81,9 @@ IF(UNIX)
4
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
4
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
5
   ENDIF()
5
   ENDIF()
6
 
6
 

Return to bug 241533