mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
databases/mysqlwsrep56-server: fix compilation with Clang 6
Similarly to what was done with databases/mysql56-server in r458124.
This commit is contained in:
parent
98801d4129
commit
2018747843
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=459077
@ -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");
|
@ -1,50 +0,0 @@
|
||||
--- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200
|
||||
+++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200
|
||||
@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]=
|
||||
{
|
||||
{
|
||||
{ C_STRING_WITH_LEN("triggers") },
|
||||
- my_offsetof(class Table_triggers_list, definitions_list),
|
||||
+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
|
||||
FILE_OPTIONS_STRLIST
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("sql_modes") },
|
||||
- my_offsetof(class Table_triggers_list, definition_modes_list),
|
||||
+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
|
||||
FILE_OPTIONS_ULLLIST
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("definers") },
|
||||
- my_offsetof(class Table_triggers_list, definers_list),
|
||||
+ static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
|
||||
FILE_OPTIONS_STRLIST
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("client_cs_names") },
|
||||
- my_offsetof(class Table_triggers_list, client_cs_names),
|
||||
+ static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
|
||||
FILE_OPTIONS_STRLIST
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("connection_cl_names") },
|
||||
- my_offsetof(class Table_triggers_list, connection_cl_names),
|
||||
+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
|
||||
FILE_OPTIONS_STRLIST
|
||||
},
|
||||
{
|
||||
{ C_STRING_WITH_LEN("db_cl_names") },
|
||||
- my_offsetof(class Table_triggers_list, db_cl_names),
|
||||
+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
|
||||
FILE_OPTIONS_STRLIST
|
||||
},
|
||||
{ { 0, 0 }, 0, FILE_OPTIONS_STRING }
|
||||
@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]=
|
||||
File_option sql_modes_parameters=
|
||||
{
|
||||
{ C_STRING_WITH_LEN("sql_modes") },
|
||||
- my_offsetof(class Table_triggers_list, definition_modes_list),
|
||||
+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
|
||||
FILE_OPTIONS_ULLLIST
|
||||
};
|
||||
|
@ -1,63 +0,0 @@
|
||||
--- sql/sql_view.cc.orig 2012-08-02 00:01:13.000000000 +0200
|
||||
+++ sql/sql_view.cc 2012-09-11 17:01:13.000000000 +0200
|
||||
@@ -730,46 +730,46 @@ static const int required_view_parameters= 14;
|
||||
*/
|
||||
static File_option view_parameters[]=
|
||||
{{{ C_STRING_WITH_LEN("query")},
|
||||
- my_offsetof(TABLE_LIST, select_stmt),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
|
||||
FILE_OPTIONS_ESTRING},
|
||||
{{ C_STRING_WITH_LEN("md5")},
|
||||
- my_offsetof(TABLE_LIST, md5),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, md5)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{ C_STRING_WITH_LEN("updatable")},
|
||||
- my_offsetof(TABLE_LIST, updatable_view),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("algorithm")},
|
||||
- my_offsetof(TABLE_LIST, algorithm),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("definer_user")},
|
||||
- my_offsetof(TABLE_LIST, definer.user),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{ C_STRING_WITH_LEN("definer_host")},
|
||||
- my_offsetof(TABLE_LIST, definer.host),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{ C_STRING_WITH_LEN("suid")},
|
||||
- my_offsetof(TABLE_LIST, view_suid),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("with_check_option")},
|
||||
- my_offsetof(TABLE_LIST, with_check),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("timestamp")},
|
||||
- my_offsetof(TABLE_LIST, timestamp),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
|
||||
FILE_OPTIONS_TIMESTAMP},
|
||||
{{ C_STRING_WITH_LEN("create-version")},
|
||||
- my_offsetof(TABLE_LIST, file_version),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("source")},
|
||||
- my_offsetof(TABLE_LIST, source),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, source)),
|
||||
FILE_OPTIONS_ESTRING},
|
||||
{{(char*) STRING_WITH_LEN("client_cs_name")},
|
||||
- my_offsetof(TABLE_LIST, view_client_cs_name),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{(char*) STRING_WITH_LEN("connection_cl_name")},
|
||||
- my_offsetof(TABLE_LIST, view_connection_cl_name),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{(char*) STRING_WITH_LEN("view_body_utf8")},
|
||||
- my_offsetof(TABLE_LIST, view_body_utf8),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
|
||||
FILE_OPTIONS_ESTRING},
|
||||
{{NullS, 0}, 0,
|
||||
FILE_OPTIONS_STRING}
|
Loading…
Reference in New Issue
Block a user