Update to 5.6.11 release.

3 files changed, 22 insertions, 28 deletions

diff --git a/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
index 7f11bedc9e43..c8e83a11342c 100644
--- a/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
@@ -1,9 +1,9 @@
---- libmysql/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ libmysql/CMakeLists.txt	2010-12-23 22:01:37.000000000 +0100
-@@ -153,13 +153,14 @@
+--- libmysql/CMakeLists.txt.orig	2013-04-05 14:27:18.000000000 +0200
++++ libmysql/CMakeLists.txt	2013-04-19 15:04:52.000000000 +0200
+@@ -173,13 +173,14 @@
+ ENDIF()
  
  # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
 -MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
 +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
  
@@ -16,21 +16,26 @@
  IF(UNIX)
    MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
      SET(DOT_VERSION ".${VERSION}")
-@@ -174,9 +175,11 @@
+@@ -194,13 +195,15 @@
    ENDMACRO()
    INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
  ENDIF()
 +ENDIF()
  
  IF(NOT DISABLE_SHARED)
--  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
-+  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL)
-+IF(FALSE)
+   # Merge several convenience libraries into one big mysqlclient
+   # and link them together into shared library.
+   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+     EXPORTS ${CLIENT_API_FUNCTIONS}
+-    COMPONENT SharedLibraries)
++    COMPONENT SharedLibraries NOINSTALL)
++ IF(FALSE)
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -223,3 +226,4 @@
+@@ -251,4 +254,5 @@
+       INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
      ENDFOREACH()
    ENDIF()
++ ENDIF()
  ENDIF()
-+ENDIF()
diff --git a/databases/mysql56-server/files/patch-sql_CMakeLists.txt b/databases/mysql56-server/files/patch-sql_CMakeLists.txt
index e4d1b520c529..2eeb4edfd51c 100644
--- a/databases/mysql56-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mysql56-server/files/patch-sql_CMakeLists.txt
@@ -1,14 +1,14 @@
---- sql/CMakeLists.txt.orig	2010-12-23 17:31:28.000000000 +0100
-+++ sql/CMakeLists.txt	2010-12-23 17:33:36.000000000 +0100
-@@ -245,6 +245,7 @@
+--- sql/CMakeLists.txt.orig	2013-04-05 14:27:18.000000000 +0200
++++ sql/CMakeLists.txt	2013-04-19 15:08:12.000000000 +0200
+@@ -423,6 +423,7 @@
  
  IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
  
 +IF(FALSE)
- # We need to create empty directories (data/test) the installation.  
- # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767
- # Avoid completely empty directories and install dummy file instead.
-@@ -286,6 +287,7 @@
+ # Copy db.opt into data/test/
+ SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
+ INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
+@@ -467,6 +468,7 @@
    INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
  ENDIF()
  ENDIF()
diff --git a/databases/mysql56-server/files/patch-sql_mysqld.cc b/databases/mysql56-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index af1f40ea64d2..000000000000
--- a/databases/mysql56-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/mysqld.cc.orig	2013-02-13 15:18:22.000000000 +0100
-+++ sql/mysqld.cc	2013-02-13 15:18:46.000000000 +0100
-@@ -6292,7 +6292,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;
-         }
-       }