Update to 5.5.33.31.1

5 files changed, 138 insertions, 4 deletions

diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 89686fd17f43..63ce5241f3d9 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -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/
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index 58191818d366..6594185cf494 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -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
diff --git a/databases/percona55-server/files/patch-sql_sql_trigger.cc b/databases/percona55-server/files/patch-sql_sql_trigger.cc
new file mode 100644
index 000000000000..7e308976b3ec
--- /dev/null
+++ b/databases/percona55-server/files/patch-sql_sql_trigger.cc
@@ -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
+ };
+ 
diff --git a/databases/percona55-server/files/patch-sql_sql_view.cc b/databases/percona55-server/files/patch-sql_sql_view.cc
new file mode 100644
index 000000000000..5f4d92d7eebf
--- /dev/null
+++ b/databases/percona55-server/files/patch-sql_sql_view.cc
@@ -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}
diff --git a/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc b/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc
new file mode 100644
index 000000000000..072f3fc60f89
--- /dev/null
+++ b/databases/percona55-server/files/patch-storage__innobase__handler__i_s.cc
@@ -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"