3e42368c29
- Remove PBXT storage engine support, as it was removed upstream [1] - Allow building mariadb with libc++ and clang [ports/182408] [2] - Use bundled jemalloc on FreeBSD < 10 [1] - Add libexecinfo support [1] - Use "FreeBSD Ports" as build comment instead of default "Source distribution" [1] PR: ports/182426 [1] PR: ports/182408 [2] Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua> (maintainer) [1] Michael Gmelin <freebsd@grem.de> [2]
50 lines
1.8 KiB
C++
50 lines
1.8 KiB
C++
--- sql/sql_trigger.cc.orig 2013-05-21 22:09:51.000000000 +0000
|
|
+++ sql/sql_trigger.cc 2013-09-26 13:15:55.450195525 +0000
|
|
@@ -192,32 +192,32 @@
|
|
{
|
|
{
|
|
{ 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 @@
|
|
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
|
|
};
|
|
|