From 8aabcde1f44c3b603047f442e7d0c0c5af0068fd Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sat, 29 Nov 2014 10:01:29 +0000
Subject: Changes 5.5.41: Unknown

---
 databases/mysql55-client/Makefile.common              |  4 ++--
 databases/mysql55-client/distinfo                     | 13 +++++--------
 databases/mysql55-client/patches/patch-CMakeLists.txt | 14 +++++++-------
 3 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'databases/mysql55-client')

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 4e76e5aeb0c..0984284d2e2 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.40 2014/10/01 09:17:18 adam Exp $
+# $NetBSD: Makefile.common,v 1.41 2014/11/29 10:01:29 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.40
+DISTNAME=	mysql-5.5.41
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 2d343d848cc..8802bd3603a 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.38 2014/11/25 14:54:22 joerg Exp $
+$NetBSD: distinfo,v 1.39 2014/11/29 10:01:29 adam Exp $
 
-SHA1 (mysql-5.5.40.tar.gz) = b93a1b14ab2de390014e99b4293e7835da133196
-RMD160 (mysql-5.5.40.tar.gz) = a0b6b9a390ba8a3abc889155d756656b28b98f70
-Size (mysql-5.5.40.tar.gz) = 21727672 bytes
-SHA1 (sphinx-2.2.5-release.tar.gz) = 27e1a37fdeff12b866b33d3bb5602894af10bb5e
-RMD160 (sphinx-2.2.5-release.tar.gz) = d37cf615dae556307dbad2bbe00144f59afe7530
-Size (sphinx-2.2.5-release.tar.gz) = 2953899 bytes
+SHA1 (mysql-5.5.41.tar.gz) = f12317efdd5b2c539ed14c7a7c69135822916419
+RMD160 (mysql-5.5.41.tar.gz) = cb56874a0146bb1e48d520c452de1779ff6f3578
+Size (mysql-5.5.41.tar.gz) = 21768300 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
-SHA1 (patch-CMakeLists.txt) = 632e036cd9578d0636328c2259a8529c36f2d14a
+SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
 SHA1 (patch-client_mysqladmin.cc) = c640d3ca742dc1b200701d21d82d8f2093917cf2
 SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
diff --git a/databases/mysql55-client/patches/patch-CMakeLists.txt b/databases/mysql55-client/patches/patch-CMakeLists.txt
index 803dfe8cc74..b71ccb0f5d2 100644
--- a/databases/mysql55-client/patches/patch-CMakeLists.txt
+++ b/databases/mysql55-client/patches/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2014/02/13 15:47:15 jperkin Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2014/11/29 10:01:29 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 Build with newer DTrace.
 
---- CMakeLists.txt.orig	2013-03-25 13:14:58.000000000 +0000
+--- CMakeLists.txt.orig	2014-11-04 07:49:52.000000000 +0000
 +++ CMakeLists.txt
-@@ -168,6 +168,7 @@ IF(DISABLE_SHARED)
+@@ -165,6 +165,7 @@ IF(DISABLE_SHARED)
    SET(WITHOUT_DYNAMIC_PLUGINS 1)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
@@ -13,15 +13,15 @@ Build with newer DTrace.
  OPTION(CYBOZU "" OFF)
  OPTION(BACKUP_TEST "" OFF)
  OPTION(WITHOUT_SERVER OFF)
-@@ -293,7 +293,6 @@ ADD_SUBDIRECTORY(strings)
+@@ -375,7 +376,6 @@ ADD_SUBDIRECTORY(strings)
  ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(regex)
  ADD_SUBDIRECTORY(mysys)
 -ADD_SUBDIRECTORY(libmysql)
  
- 
  IF(WITH_UNIT_TESTS)
-@@ -305,9 +304,13 @@ IF(WITH_UNIT_TESTS)
+  ENABLE_TESTING()
+@@ -387,9 +387,13 @@ IF(WITH_UNIT_TESTS)
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -37,7 +37,7 @@ Build with newer DTrace.
    ADD_SUBDIRECTORY(sql)
    ADD_SUBDIRECTORY(sql/share)
    ADD_SUBDIRECTORY(libservices)
-@@ -320,11 +323,7 @@ IF(NOT WITHOUT_SERVER)
+@@ -402,11 +406,7 @@ IF(NOT WITHOUT_SERVER)
    ADD_SUBDIRECTORY(mysql-test)
    ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
    ADD_SUBDIRECTORY(support-files)
-- 
cgit v1.2.3