Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb101-server/files/patch-sql_sql__view.cc
--- sql/sql_view.cc.orig 2015-06-17 14:54:12 UTC | Fix clang build error | ||||
--- sql/sql_view.cc.orig 2015-10-15 15:43:47 UTC | |||||
+++ sql/sql_view.cc | +++ sql/sql_view.cc | ||||
@@ -716,46 +716,46 @@ static const int required_view_parameter | @@ -720,46 +720,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 52 Lines • Show Last 20 Lines |