mirror of
https://git.freebsd.org/ports.git
synced 2025-05-24 23:16:33 -04:00
databases/mysqlwsrep57-server: replay r459359 from mysql57-server
r459359 | mmokhi | 2018-01-18 17:09:53 +0100 (Thu, 18 Jan 2018) | 5 lines databases/mysql57-server: Delete no-longer-needed patch. The patch was casting variables to right size on previous versions Issue seems fixed by upstream it's not needed anymore. It also fixes a warning/error for from Clang6 on the port build.
This commit is contained in:
parent
043d1b9a7e
commit
fc32d12c19
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=481554
1 changed files with 0 additions and 63 deletions
|
@ -1,63 +0,0 @@
|
|||
--- sql/sql_view.cc.orig 2016-03-28 18:06:12 UTC
|
||||
+++ sql/sql_view.cc
|
||||
@@ -773,46 +773,46 @@ static const int required_view_parameter
|
||||
*/
|
||||
static File_option view_parameters[]=
|
||||
{{{ C_STRING_WITH_LEN("query")},
|
||||
- my_offsetof(TABLE_LIST, select_stmt),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
|
||||
FILE_OPTIONS_ESTRING},
|
||||
{{ C_STRING_WITH_LEN("md5")},
|
||||
- my_offsetof(TABLE_LIST, md5),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, md5)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{ C_STRING_WITH_LEN("updatable")},
|
||||
- my_offsetof(TABLE_LIST, updatable_view),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("algorithm")},
|
||||
- my_offsetof(TABLE_LIST, algorithm),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("definer_user")},
|
||||
- my_offsetof(TABLE_LIST, definer.user),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{ C_STRING_WITH_LEN("definer_host")},
|
||||
- my_offsetof(TABLE_LIST, definer.host),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{ C_STRING_WITH_LEN("suid")},
|
||||
- my_offsetof(TABLE_LIST, view_suid),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("with_check_option")},
|
||||
- my_offsetof(TABLE_LIST, with_check),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("timestamp")},
|
||||
- my_offsetof(TABLE_LIST, timestamp),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
|
||||
FILE_OPTIONS_TIMESTAMP},
|
||||
{{ C_STRING_WITH_LEN("create-version")},
|
||||
- my_offsetof(TABLE_LIST, file_version),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
|
||||
FILE_OPTIONS_ULONGLONG},
|
||||
{{ C_STRING_WITH_LEN("source")},
|
||||
- my_offsetof(TABLE_LIST, source),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, source)),
|
||||
FILE_OPTIONS_ESTRING},
|
||||
{{(char*) STRING_WITH_LEN("client_cs_name")},
|
||||
- my_offsetof(TABLE_LIST, view_client_cs_name),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{(char*) STRING_WITH_LEN("connection_cl_name")},
|
||||
- my_offsetof(TABLE_LIST, view_connection_cl_name),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
|
||||
FILE_OPTIONS_STRING},
|
||||
{{(char*) STRING_WITH_LEN("view_body_utf8")},
|
||||
- my_offsetof(TABLE_LIST, view_body_utf8),
|
||||
+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
|
||||
FILE_OPTIONS_ESTRING},
|
||||
{{NullS, 0}, 0,
|
||||
FILE_OPTIONS_STRING}
|
Loading…
Add table
Reference in a new issue