opnsense-ports/databases/mariadb100-server/files/patch-sql_sql__trigger.cc
Franco Fichtner 9dcc1db2c3 */*: sync with upstream
Taken from: FreeBSD
2015-08-13 09:36:11 +02:00

50 lines
1.8 KiB
C++

--- sql/sql_trigger.cc.orig 2015-06-17 14:54:12 UTC
+++ sql/sql_trigger.cc
@@ -192,32 +192,32 @@ static File_option triggers_file_paramet
{
{
{ 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_paramet
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
};