summaryrefslogtreecommitdiff
path: root/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2019-09-10 20:15:39 +0000
committerKurt Jaeger <pi@FreeBSD.org>2019-09-10 20:15:39 +0000
commite95cd2ee4667d8a20244e17e2d27528814317a07 (patch)
tree5f503527ebb1363de31f5caa4cd4dd6cdeb626c2 /databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc
parentdatabases/mysqlwsrep57-server: upgrade 5.7.26-25.18 -> 5.7.27-25.19 (diff)
databases/mysqlwsrep56-server: upgrade 5.6.44-25.26 -> 5.6.45-25.27
PR: 240345 Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com> Relnotes: http://releases.galeracluster.com/mysql-wsrep-5.6.45-25.27/release-notes-mysql-wsrep-5.6.45-25.27.txt
Notes
Notes: svn path=/head/; revision=511776
Diffstat (limited to 'databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc')
-rw-r--r--databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc17
1 files changed, 0 insertions, 17 deletions
diff --git a/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc b/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc
deleted file mode 100644
index fdbf5eb98562..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int')
- mysql->options.extension->server_public_key_path != '\0')
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~
-
-Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4
-
---- sql-common/client_authentication.cc.orig 2017-09-13 15:49:17 UTC
-+++ sql-common/client_authentication.cc
-@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
-
- if (mysql->options.extension != NULL &&
- mysql->options.extension->server_public_key_path != NULL &&
-- mysql->options.extension->server_public_key_path != '\0')
-+ mysql->options.extension->server_public_key_path[0] != '\0')
- {
- pub_key_file= fopen(mysql->options.extension->server_public_key_path,
- "r");