From 511f6cbe19cc6303a76d44e7f12399d8bda434fc Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 5 Jan 2018 10:54:41 +0000 Subject: 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(my_offsetof(class Table_triggers_list, definitions_list)), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported by: antoine (via bug 224669) --- .../mysql56-server/files/patch-sql_sql_trigger.cc | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 databases/mysql56-server/files/patch-sql_sql_trigger.cc (limited to 'databases/mysql56-server/files/patch-sql_sql_trigger.cc') diff --git a/databases/mysql56-server/files/patch-sql_sql_trigger.cc b/databases/mysql56-server/files/patch-sql_sql_trigger.cc deleted file mode 100644 index 7e308976b3ec..000000000000 --- a/databases/mysql56-server/files/patch-sql_sql_trigger.cc +++ /dev/null @@ -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(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(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(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(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(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(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(my_offsetof(class Table_triggers_list, definition_modes_list)), - FILE_OPTIONS_ULLLIST - }; - -- cgit v1.2.3