[csw-devel] SF.net SVN: gar:[20351] csw/mgar/pkg/mysql5/branches/mysql-5.6.x

[janholzh at users.sourceforge.net]

Revision: 20351
          http://gar.svn.sourceforge.net/gar/?rev=20351&view=rev
Author:   janholzh
Date:     2013-02-28 15:58:35 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
more work to get it to build

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0003-it_is_lz_not_lzlib.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/mysql-bug.67018.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2013-02-28 14:27:35 UTC (rev 20350)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2013-02-28 15:58:35 UTC (rev 20351)
@@ -71,6 +71,8 @@
 # PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch
 PATCHFILES += 0005-Do-not-strip-RPATH-from-binaries.patch
 #PATCHFILES += 0002-do_not_use_libstlport.patch
+PATCHFILES += mysql-bug.67018.patch
+PATCHFILES += 0003-it_is_lz_not_lzlib.patch
 
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)

Added: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0003-it_is_lz_not_lzlib.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0003-it_is_lz_not_lzlib.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/0003-it_is_lz_not_lzlib.patch	2013-02-28 15:58:35 UTC (rev 20351)
@@ -0,0 +1,25 @@
+From b2ba0a64ac891eccac82713647c80dde977b5b53 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Thu, 28 Feb 2013 16:47:31 +0100
+Subject: [PATCH] it_is_lz_not_lzlib
+
+---
+ storage/perfschema/unittest/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/storage/perfschema/unittest/CMakeLists.txt b/storage/perfschema/unittest/CMakeLists.txt
+index 47539ff..55960e9 100644
+--- a/storage/perfschema/unittest/CMakeLists.txt
++++ b/storage/perfschema/unittest/CMakeLists.txt
+@@ -63,7 +63,7 @@ TARGET_LINK_LIBRARIES(pfs_connect_attr-t ${MYSQLD_STATIC_PLUGIN_LIBS})
+ TARGET_LINK_LIBRARIES(pfs_connect_attr-t sql binlog rpl master slave sql)
+ TARGET_LINK_LIBRARIES(pfs_connect_attr-t mysys mysys_ssl)
+ TARGET_LINK_LIBRARIES(pfs_connect_attr-t vio ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys zlib)
++TARGET_LINK_LIBRARIES(pfs_connect_attr-t strings dbug regex mysys z)
+ ADD_TEST(pfs_connect_attr pfs_connect_attr-t)
+ 
+ # On windows, pfs_connect_attr-t may depend on openssl dlls.
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/mysql-bug.67018.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/mysql-bug.67018.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/mysql-bug.67018.patch	2013-02-28 15:58:35 UTC (rev 20351)
@@ -0,0 +1,13 @@
+Index: trunk/sql/mysqld.cc
+===================================================================
+--- trunk.orig/sql/mysqld.cc	2013-01-09 11:59:43.902887077 +0100
++++ trunk/sql/mysqld.cc	2013-01-09 12:00:31.518888125 +0100
+@@ -6262,7 +6262,7 @@
+             The connection was refused by TCP wrappers.
+             There are no details (by client IP) available to update the host_cache.
+           */
+-          statistic_increment(connection_tcpwrap_errors, &LOCK_status);
++          statistic_increment(connection_errors_tcpwrap, &LOCK_status);
+           continue;
+         }
+       }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.