1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

Update to 5.6.13-rc60.6

This commit is contained in:
Florian Smeets 2013-09-30 20:49:34 +00:00
parent f1685df279
commit 77db98be43
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=328872
4 changed files with 117 additions and 4 deletions

View File

@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME?= percona
DISTVERSION= 5.6.13-rc60.5
DISTVERSION= 5.6.13-rc60.6
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/
PKGNAMESUFFIX?= -server
DISTNAME= Percona-Server-5.6.13-rc60.5
DISTNAME= Percona-Server-5.6.13-rc60.6
MAINTAINER= flo@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)

View File

@ -1,2 +1,2 @@
SHA256 (Percona-Server-5.6.13-rc60.5.tar.gz) = 90de6997d2d20e37aa7d7e240ad310a446c5c85ae55cd4146bf6b17ffd5bb0a5
SIZE (Percona-Server-5.6.13-rc60.5.tar.gz) = 33213326
SHA256 (Percona-Server-5.6.13-rc60.6.tar.gz) = 56f81458d7fcdaa619586be578e12a1b24aa54094f412fb9f8bd2004d1e8546e
SIZE (Percona-Server-5.6.13-rc60.6.tar.gz) = 33338612

View File

@ -0,0 +1,50 @@
--- sql/sql_trigger.cc.orig 2012-08-02 00:01:13.000000000 +0200
+++ sql/sql_trigger.cc 2012-09-11 17:01:13.000000000 +0200
@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]=
{
{
{ 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_parameters[]=
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
};

View File

@ -0,0 +1,63 @@
--- sql/sql_view.cc.orig 2012-08-02 00:01:13.000000000 +0200
+++ sql/sql_view.cc 2012-09-11 17:01:13.000000000 +0200
@@ -730,46 +730,46 @@ static const int required_view_parameters= 14;
*/
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}