summaryrefslogtreecommitdiff
path: root/databases/mysql56-client/files
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-01-05 10:54:41 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-01-05 10:54:41 +0000
commit511f6cbe19cc6303a76d44e7f12399d8bda434fc (patch)
tree347329f95d9bd4a3fa1d5bbd0e9df0b9eedad109 /databases/mysql56-client/files
parent- Add thefuck 3.25 (diff)
databases/mysql56-server: unbreak build with Clang 6 (C++14 by default)
sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int') mysql->options.extension->server_public_key_path != '\0') ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~ sql/sql_trigger.cc:195:5: error: non-constant-expression cannot be narrowed from type 'int' to 'size_t' (aka 'unsigned long') in initializer list [-Wc++11-narrowing] static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported by: antoine (via bug 224669)
Notes
Notes: svn path=/head/; revision=458124
Diffstat (limited to 'databases/mysql56-client/files')
-rw-r--r--databases/mysql56-client/files/patch-sql-common_client__authentication.cc17
1 files changed, 17 insertions, 0 deletions
diff --git a/databases/mysql56-client/files/patch-sql-common_client__authentication.cc b/databases/mysql56-client/files/patch-sql-common_client__authentication.cc
new file mode 100644
index 000000000000..fdbf5eb98562
--- /dev/null
+++ b/databases/mysql56-client/files/patch-sql-common_client__authentication.cc
@@ -0,0 +1,17 @@
+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");