Page MenuHomeFreeBSD
Differential D9427 Diff 24697 databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc

Changeset View

Standalone View

View Options

databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc

  • This file was copied from databases/mysql56-server/files/patch-sql_sql_trigger.cc.
--- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200 --- sql/sql_trigger.cc.orig 2017-01-25 07:58:07 UTC
+++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200 +++ sql/sql_trigger.cc
@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]= @@ -192,32 +192,32 @@ static File_option triggers_file_paramet
{ {
{ {
{ C_STRING_WITH_LEN("triggers") }, { C_STRING_WITH_LEN("triggers") },
- my_offsetof(class Table_triggers_list, definitions_list), - my_offsetof(class Table_triggers_list, definitions_list),
+ static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), + static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
FILE_OPTIONS_STRLIST FILE_OPTIONS_STRLIST
}, },
{ {
Show All 22 Lines+ static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
}, },
{ {
{ C_STRING_WITH_LEN("db_cl_names") }, { C_STRING_WITH_LEN("db_cl_names") },
- my_offsetof(class Table_triggers_list, db_cl_names), - my_offsetof(class Table_triggers_list, db_cl_names),
+ static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)), + static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
FILE_OPTIONS_STRLIST FILE_OPTIONS_STRLIST
}, },
{ { 0, 0 }, 0, FILE_OPTIONS_STRING } { { 0, 0 }, 0, FILE_OPTIONS_STRING }
@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]= @@ -226,7 +226,7 @@ static File_option triggers_file_paramet
File_option sql_modes_parameters= File_option sql_modes_parameters=
{ {
{ C_STRING_WITH_LEN("sql_modes") }, { C_STRING_WITH_LEN("sql_modes") },
- my_offsetof(class Table_triggers_list, definition_modes_list), - my_offsetof(class Table_triggers_list, definition_modes_list),
+ static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), + static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
FILE_OPTIONS_ULLLIST FILE_OPTIONS_ULLLIST
}; };