diff options
author | Vasil Dimov <vd@FreeBSD.org> | 2018-01-15 16:31:19 +0000 |
---|---|---|
committer | Vasil Dimov <vd@FreeBSD.org> | 2018-01-15 16:31:19 +0000 |
commit | 2018747843774c06683a4cd4d4fd31f3ce747c28 (patch) | |
tree | 9e9ba5ed4c9dbf836617858b76bbb56651b8014b /databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc | |
parent | textproc/rubygem-rouge: update to 3.1.0 (diff) |
databases/mysqlwsrep56-server: fix compilation with Clang 6
Similarly to what was done with databases/mysql56-server in r458124.
Notes
Notes:
svn path=/head/; revision=459077
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.cc | 17 |
1 files changed, 17 insertions, 0 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 new file mode 100644 index 000000000000..fdbf5eb98562 --- /dev/null +++ b/databases/mysqlwsrep56-server/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"); |