From owner-svn-ports-head@FreeBSD.ORG Mon Sep 30 20:47:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1920E45F; Mon, 30 Sep 2013 20:47:20 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EBBDF2422; Mon, 30 Sep 2013 20:47:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8UKlJBd024333; Mon, 30 Sep 2013 20:47:19 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8UKlIip024328; Mon, 30 Sep 2013 20:47:18 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201309302047.r8UKlIip024328@svn.freebsd.org> From: Florian Smeets Date: Mon, 30 Sep 2013 20:47:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328871 - in head/databases/percona55-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2013 20:47:20 -0000 Author: flo Date: Mon Sep 30 20:47:18 2013 New Revision: 328871 URL: http://svnweb.freebsd.org/changeset/ports/328871 Log: Update to 5.5.33.31.1 Added: head/databases/percona55-server/files/patch-sql_sql_trigger.cc (contents, props changed) head/databases/percona55-server/files/patch-sql_sql_view.cc (contents, props changed) head/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc (contents, props changed) Modified: head/databases/percona55-server/Makefile head/databases/percona55-server/distinfo Modified: head/databases/percona55-server/Makefile ============================================================================== --- head/databases/percona55-server/Makefile Mon Sep 30 20:41:25 2013 (r328870) +++ head/databases/percona55-server/Makefile Mon Sep 30 20:47:18 2013 (r328871) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= percona -PORTVERSION= 5.5.32.31.0 -DISTNAME= Percona-Server-5.5.32-rel31.0 +PORTVERSION= 5.5.33.31.1 +DISTNAME= Percona-Server-5.5.33-rel31.1 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME:S/rel//}/source/ Modified: head/databases/percona55-server/distinfo ============================================================================== --- head/databases/percona55-server/distinfo Mon Sep 30 20:41:25 2013 (r328870) +++ head/databases/percona55-server/distinfo Mon Sep 30 20:47:18 2013 (r328871) @@ -1,2 +1,2 @@ -SHA256 (Percona-Server-5.5.32-rel31.0.tar.gz) = e34676cea5ceb398258408e31e8527724845f83bbbf1f22308f5069304118e8f -SIZE (Percona-Server-5.5.32-rel31.0.tar.gz) = 22526210 +SHA256 (Percona-Server-5.5.33-rel31.1.tar.gz) = 2039ae974d0973b765a4cdc7ffa1dc75ebd93540769fb134b3a8dc521dfc0b3a +SIZE (Percona-Server-5.5.33-rel31.1.tar.gz) = 22538385 Added: head/databases/percona55-server/files/patch-sql_sql_trigger.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona55-server/files/patch-sql_sql_trigger.cc Mon Sep 30 20:47:18 2013 (r328871) @@ -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(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(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(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(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(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(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(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }; + Added: head/databases/percona55-server/files/patch-sql_sql_view.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona55-server/files/patch-sql_sql_view.cc Mon Sep 30 20:47:18 2013 (r328871) @@ -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(my_offsetof(TABLE_LIST, select_stmt)), + FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("md5")}, +- my_offsetof(TABLE_LIST, md5), ++ static_cast(my_offsetof(TABLE_LIST, md5)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("updatable")}, +- my_offsetof(TABLE_LIST, updatable_view), ++ static_cast(my_offsetof(TABLE_LIST, updatable_view)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("algorithm")}, +- my_offsetof(TABLE_LIST, algorithm), ++ static_cast(my_offsetof(TABLE_LIST, algorithm)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("definer_user")}, +- my_offsetof(TABLE_LIST, definer.user), ++ static_cast(my_offsetof(TABLE_LIST, definer.user)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("definer_host")}, +- my_offsetof(TABLE_LIST, definer.host), ++ static_cast(my_offsetof(TABLE_LIST, definer.host)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("suid")}, +- my_offsetof(TABLE_LIST, view_suid), ++ static_cast(my_offsetof(TABLE_LIST, view_suid)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("with_check_option")}, +- my_offsetof(TABLE_LIST, with_check), ++ static_cast(my_offsetof(TABLE_LIST, with_check)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("timestamp")}, +- my_offsetof(TABLE_LIST, timestamp), ++ static_cast(my_offsetof(TABLE_LIST, timestamp)), + FILE_OPTIONS_TIMESTAMP}, + {{ C_STRING_WITH_LEN("create-version")}, +- my_offsetof(TABLE_LIST, file_version), ++ static_cast(my_offsetof(TABLE_LIST, file_version)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("source")}, +- my_offsetof(TABLE_LIST, source), ++ static_cast(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(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(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(my_offsetof(TABLE_LIST, view_body_utf8)), + FILE_OPTIONS_ESTRING}, + {{NullS, 0}, 0, + FILE_OPTIONS_STRING} Added: head/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc Mon Sep 30 20:47:18 2013 (r328871) @@ -0,0 +1,21 @@ +--- storage/innobase/handler/i_s.cc.orig 2013-08-27 16:58:46.000000000 +0200 ++++ storage/innobase/handler/i_s.cc 2013-09-30 19:31:59.983048770 +0200 +@@ -48,14 +48,18 @@ + #include "btr0types.h" + #include "buf0buddy.h" + #include "buf0buf.h" ++#include "buf0lru.h" ++#include "dict0load.h" + #include "ibuf0ibuf.h" + #include "dict0mem.h" + #include "dict0types.h" + #include "dict0boot.h" + #include "ha_prototypes.h" ++#include "srv0srv.h" + #include "srv0start.h" + #include "trx0i_s.h" + #include "trx0rseg.h" ++#include "trx0trx.h" + #include "trx0undo.h" + #include "log0online.h" + #include "btr0btr.h"