Page MenuHomeFreeBSD
Differential D2771 Diff 7499 databases/mariadb100-server/files/patch-sql_sql__view.cc

Changeset View

Standalone View

View Options

databases/mariadb100-server/files/patch-sql_sql__view.cc

--- sql/sql_view.cc.orig 2013-05-21 22:09:51.000000000 +0000 --- sql/sql_view.cc.orig 2015-06-17 14:54:12 UTC
+++ sql/sql_view.cc 2013-09-26 13:16:16.065195172 +0000 +++ sql/sql_view.cc
@@ -742,46 +742,46 @@ @@ -716,46 +716,46 @@ static const int required_view_parameter
*/ */
static File_option view_parameters[]= static File_option view_parameters[]=
{{{ C_STRING_WITH_LEN("query")}, {{{ C_STRING_WITH_LEN("query")},
- my_offsetof(TABLE_LIST, select_stmt), - my_offsetof(TABLE_LIST, select_stmt),
+ static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), + static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
FILE_OPTIONS_ESTRING}, FILE_OPTIONS_ESTRING},
{{ C_STRING_WITH_LEN("md5")}, {{ C_STRING_WITH_LEN("md5")},
- my_offsetof(TABLE_LIST, md5), - my_offsetof(TABLE_LIST, md5),
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines+ static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
{{(char*) STRING_WITH_LEN("connection_cl_name")}, {{(char*) STRING_WITH_LEN("connection_cl_name")},
- my_offsetof(TABLE_LIST, view_connection_cl_name), - my_offsetof(TABLE_LIST, view_connection_cl_name),
+ static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)), + static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
FILE_OPTIONS_STRING}, FILE_OPTIONS_STRING},
{{(char*) STRING_WITH_LEN("view_body_utf8")}, {{(char*) STRING_WITH_LEN("view_body_utf8")},
- my_offsetof(TABLE_LIST, view_body_utf8), - my_offsetof(TABLE_LIST, view_body_utf8),
+ static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), + static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
FILE_OPTIONS_ESTRING}, FILE_OPTIONS_ESTRING},
{{NullS, 0}, 0, {{ C_STRING_WITH_LEN("mariadb-version")},
FILE_OPTIONS_STRING} my_offsetof(TABLE_LIST, mariadb_version),