mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 20:20:30 -04:00
4af533cdd3
- Update to 10.0.21 - Updates mariadb100-client as well (slave-port) - Silence portlint - Re-roll patches with makepatch [1] https://mariadb.atlassian.net/browse/MDEV-7398 [2] https://mariadb.atlassian.net/browse/MDEV-8128 Changes: https://mariadb.com/kb/en/mariadb/mariadb-10021-changelog/ Differential revision: https://reviews.freebsd.org/D2771 Reviewed by: koobs (mentor), vsevolod (mentor) Approved by: vsevolod (mentor) PR: 200097 Security: 36bd352d-299b-11e5-86ff-14dae9d210b8 MFH: 2015Q3
50 lines
1.8 KiB
C++
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
|
|
};
|
|
|