From ea57ca1063e3db3a434db17fea22fe5e7793ffa8 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Tue, 9 Aug 2011 11:12:44 +0000 Subject: [PATCH] Update to 5.5.15 release. --- databases/mysql55-server/Makefile | 2 +- databases/mysql55-server/distinfo | 4 ++-- .../mysql55-server/files/patch-libmysqld_lib_sql.cc | 13 ------------- databases/percona55-server/Makefile | 2 +- databases/percona55-server/distinfo | 4 ++-- .../files/patch-libmysqld_lib_sql.cc | 13 ------------- 6 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 databases/mysql55-server/files/patch-libmysqld_lib_sql.cc delete mode 100644 databases/percona55-server/files/patch-libmysqld_lib_sql.cc diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 8e79d36a43b2..953df5e26c2d 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.5.14 +PORTVERSION= 5.5.15 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index d1594acb47a4..3d45e7b9b460 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.14.tar.gz) = c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738 -SIZE (mysql-5.5.14.tar.gz) = 23772997 +SHA256 (mysql-5.5.15.tar.gz) = bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82 +SIZE (mysql-5.5.15.tar.gz) = 23774015 diff --git a/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc b/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc deleted file mode 100644 index bc520caf038e..000000000000 --- a/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- libmysqld/lib_sql.cc.orig 2011-01-13 09:53:29.000000000 +0100 -+++ libmysqld/lib_sql.cc 2011-01-13 09:54:03.000000000 +0100 -@@ -510,8 +510,8 @@ - return 1; - defaults_argc= *argcp; - defaults_argv= *argvp; -- remaining_argc= argc; -- remaining_argv= argv; -+ remaining_argc= *argcp; -+ remaining_argv= *argvp; - - /* Must be initialized early for comparison of options name */ - system_charset_info= &my_charset_utf8_general_ci; diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 8e79d36a43b2..953df5e26c2d 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.5.14 +PORTVERSION= 5.5.15 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index d1594acb47a4..3d45e7b9b460 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.14.tar.gz) = c7acab9ccb1e2598d079fe8b832281343c00b5b8032fcece37ef551b61980738 -SIZE (mysql-5.5.14.tar.gz) = 23772997 +SHA256 (mysql-5.5.15.tar.gz) = bed15094b15bb89836c164b9d93eb8f3180caeb6017c8312e33a0c71eb9c5c82 +SIZE (mysql-5.5.15.tar.gz) = 23774015 diff --git a/databases/percona55-server/files/patch-libmysqld_lib_sql.cc b/databases/percona55-server/files/patch-libmysqld_lib_sql.cc deleted file mode 100644 index bc520caf038e..000000000000 --- a/databases/percona55-server/files/patch-libmysqld_lib_sql.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- libmysqld/lib_sql.cc.orig 2011-01-13 09:53:29.000000000 +0100 -+++ libmysqld/lib_sql.cc 2011-01-13 09:54:03.000000000 +0100 -@@ -510,8 +510,8 @@ - return 1; - defaults_argc= *argcp; - defaults_argv= *argvp; -- remaining_argc= argc; -- remaining_argv= argv; -+ remaining_argc= *argcp; -+ remaining_argv= *argvp; - - /* Must be initialized early for comparison of options name */ - system_charset_info= &my_charset_utf8_general_ci;