diff options
author | Bernard Spil <brnrd@FreeBSD.org> | 2017-05-04 09:33:18 +0000 |
---|---|---|
committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-05-04 09:33:18 +0000 |
commit | e1822696f3e93a27ffdc0cdb1b819500c2ef67ab (patch) | |
tree | 965588404bc3f21423336be4e298ca6980a526f7 /databases/mariadb55-server/files/patch-sql_sql__trigger.cc | |
parent | databases/mariadb101-server: Update to 10.1.23 (diff) |
databases/mariadb55-server: Update to 5.5.56
- Bugfix update to 5.5.56
- Re-roll patches
- Convert patches to new naming convention
- Add/move ldconfig config to -server
- Move client option to -client port
Notes
Notes:
svn path=/head/; revision=440095
Diffstat (limited to 'databases/mariadb55-server/files/patch-sql_sql__trigger.cc')
-rw-r--r-- | databases/mariadb55-server/files/patch-sql_sql__trigger.cc | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/databases/mariadb55-server/files/patch-sql_sql__trigger.cc b/databases/mariadb55-server/files/patch-sql_sql__trigger.cc new file mode 100644 index 000000000000..744f03981d6c --- /dev/null +++ b/databases/mariadb55-server/files/patch-sql_sql__trigger.cc @@ -0,0 +1,50 @@ +--- sql/sql_trigger.cc.orig 2017-04-30 11:09:31 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 + }; + |