From 302d685ac6e675526b414308fc12a154c4128988 Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Sun, 28 May 2017 20:52:49 +0000 Subject: databases/mariadb102-server: Add MariaDB 10.2 ports - Add mariadb102-client port - Add RocksDB storage engine - Add non-base page compressors - First sweep at making cmake patches upstreamable --- .../files/patch-sql_sql__trigger.cc | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 databases/mariadb102-server/files/patch-sql_sql__trigger.cc (limited to 'databases/mariadb102-server/files/patch-sql_sql__trigger.cc') diff --git a/databases/mariadb102-server/files/patch-sql_sql__trigger.cc b/databases/mariadb102-server/files/patch-sql_sql__trigger.cc new file mode 100644 index 000000000000..922e38d05e3d --- /dev/null +++ b/databases/mariadb102-server/files/patch-sql_sql__trigger.cc @@ -0,0 +1,52 @@ +Fix clang build error + +--- sql/sql_trigger.cc.orig 2017-05-14 23:13:18 UTC ++++ sql/sql_trigger.cc +@@ -177,32 +177,32 @@ static File_option triggers_file_paramet + { + { + { 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 + }, + { +@@ -216,7 +216,7 @@ static File_option triggers_file_paramet + 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