diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-09-30 22:32:28 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-09-30 22:32:28 +0000 |
| commit | 3e42368c2900f8c82d787e2b3edf2bf4dcee5c64 (patch) | |
| tree | e42fc3c2c7e52aaa3bdb3eb1bb088c621570bfd9 /databases/mariadb55-server/files/patch-sql_sql_view.cc | |
| parent | Remove some test code accidentally included in previous commit. (diff) | |
- Update to 5.5.33a [1]
- 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]
Notes
Notes:
svn path=/head/; revision=328885
Diffstat (limited to 'databases/mariadb55-server/files/patch-sql_sql_view.cc')
| -rw-r--r-- | databases/mariadb55-server/files/patch-sql_sql_view.cc | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/databases/mariadb55-server/files/patch-sql_sql_view.cc b/databases/mariadb55-server/files/patch-sql_sql_view.cc new file mode 100644 index 000000000000..8b6d0b84579f --- /dev/null +++ b/databases/mariadb55-server/files/patch-sql_sql_view.cc @@ -0,0 +1,63 @@ +--- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000 ++++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000 +@@ -742,46 +742,46 @@ + */ + 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_VIEW_ALGO}, + {{ 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} |