diff options
author | adam <adam@pkgsrc.org> | 2013-04-20 08:06:56 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2013-04-20 08:06:56 +0000 |
commit | 109fc2301829fc3d3e1428f8ee1e91a0ea1ce95e (patch) | |
tree | 0e634a0bc81d3281f7f90538c9b2441a64db1fe4 /databases | |
parent | 909f2685cd15a8aff59d71f0297d4d789ccf47d7 (diff) | |
download | pkgsrc-109fc2301829fc3d3e1428f8ee1e91a0ea1ce95e.tar.gz |
Changes 5.5.31:
MySQL no longer uses the default OpenSSL compression.
Bug fixes.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mysql55-client/Makefile.common | 4 | ||||
-rw-r--r-- | databases/mysql55-client/distinfo | 13 | ||||
-rw-r--r-- | databases/mysql55-client/patches/patch-CMakeLists.txt | 10 | ||||
-rw-r--r-- | databases/mysql55-client/patches/patch-sql_CMakeLists.txt | 8 | ||||
-rw-r--r-- | databases/mysql55-client/patches/patch-vio_viossl.c | 15 | ||||
-rw-r--r-- | databases/mysql55-server/PLIST | 4 |
6 files changed, 36 insertions, 18 deletions
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common index e9a4a4c258d..40985ce4268 100644 --- a/databases/mysql55-client/Makefile.common +++ b/databases/mysql55-client/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.26 2013/02/12 20:36:28 adam Exp $ +# $NetBSD: Makefile.common,v 1.27 2013/04/20 08:06:56 adam Exp $ # # used by databases/mysql55-client/Makefile # used by databases/mysql55-server/Makefile -DISTNAME= mysql-5.5.30 +DISTNAME= mysql-5.5.31 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo index 3cf40890d82..04a714322dc 100644 --- a/databases/mysql55-client/distinfo +++ b/databases/mysql55-client/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.21 2013/02/12 20:36:28 adam Exp $ +$NetBSD: distinfo,v 1.22 2013/04/20 08:06:56 adam Exp $ -SHA1 (mysql-5.5.30.tar.gz) = d7e31246d29f6ed4a9c4b966d6896bf920b68351 -RMD160 (mysql-5.5.30.tar.gz) = 6d93cf458a732e63e6d2b3939051233bcd0dea0a -Size (mysql-5.5.30.tar.gz) = 24499036 bytes +SHA1 (mysql-5.5.31.tar.gz) = a65fb40a856b6b9bcd06e39ee7baf6d43a094e2f +RMD160 (mysql-5.5.31.tar.gz) = a0c61199a410ce48058d1668a181bc9811c12ba4 +Size (mysql-5.5.31.tar.gz) = 24608323 bytes SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 -SHA1 (patch-CMakeLists.txt) = fc3d3854090ac19dec28ed03b41d78069304f23d +SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0 SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206 @@ -19,10 +19,11 @@ SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb89 SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3 SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59 SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478 -SHA1 (patch-sql_CMakeLists.txt) = 6cf54ba886f220c8fe7675a0a3acc83257b9f596 +SHA1 (patch-sql_CMakeLists.txt) = c4e72a0a93eb94a94501c267e2a43aedf8de2c76 SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8 SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c SHA1 (patch-sql_sql_string.h) = 32c0caf813f7ba94e9ed8fc6d0da4b4a52b41141 SHA1 (patch-storage_innobase_include_os0sync.h) = d3f66b063af3328f3ee518dd00dfc9d1d25943dc SHA1 (patch-storage_ndb_include_util_Parser.hpp) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be SHA1 (patch-strings_decimal.c) = dafedbfbd71149890f3356f3cafa77d6d0466f0f +SHA1 (patch-vio_viossl.c) = bc1922f1170ff55a6ed832b90c110e788b49d4be diff --git a/databases/mysql55-client/patches/patch-CMakeLists.txt b/databases/mysql55-client/patches/patch-CMakeLists.txt index b42cd612890..22c96b629ff 100644 --- a/databases/mysql55-client/patches/patch-CMakeLists.txt +++ b/databases/mysql55-client/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.3 2012/10/01 15:54:40 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.4 2013/04/20 08:06:56 adam Exp $ Split configuration between mysql-client and mysql-server. ---- CMakeLists.txt.orig 2012-08-29 08:50:46.000000000 +0000 +--- CMakeLists.txt.orig 2013-03-25 13:14:58.000000000 +0000 +++ CMakeLists.txt -@@ -292,7 +292,6 @@ ADD_SUBDIRECTORY(strings) +@@ -293,7 +293,6 @@ ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) @@ -12,7 +12,7 @@ Split configuration between mysql-client and mysql-server. IF(WITH_UNIT_TESTS) -@@ -304,9 +303,13 @@ IF(WITH_UNIT_TESTS) +@@ -305,9 +304,13 @@ IF(WITH_UNIT_TESTS) ENDIF() ADD_SUBDIRECTORY(extra) @@ -28,7 +28,7 @@ Split configuration between mysql-client and mysql-server. ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(libservices) -@@ -319,11 +322,7 @@ IF(NOT WITHOUT_SERVER) +@@ -320,11 +323,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) diff --git a/databases/mysql55-client/patches/patch-sql_CMakeLists.txt b/databases/mysql55-client/patches/patch-sql_CMakeLists.txt index 18ac366cf33..ddf0cbae368 100644 --- a/databases/mysql55-client/patches/patch-sql_CMakeLists.txt +++ b/databases/mysql55-client/patches/patch-sql_CMakeLists.txt @@ -1,8 +1,8 @@ -$NetBSD: patch-sql_CMakeLists.txt,v 1.2 2012/10/01 15:54:40 adam Exp $ +$NetBSD: patch-sql_CMakeLists.txt,v 1.3 2013/04/20 08:06:56 adam Exp $ Do not install files in MYSQL_DATADIR. ---- sql/CMakeLists.txt.orig 2011-04-25 19:03:50.000000000 +0000 +--- sql/CMakeLists.txt.orig 2013-03-25 13:14:58.000000000 +0000 +++ sql/CMakeLists.txt @@ -259,7 +259,7 @@ ADD_CUSTOM_TARGET(distclean VERBATIM @@ -11,5 +11,5 @@ Do not install files in MYSQL_DATADIR. -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 + # Copy db.opt into data/test/ + SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) diff --git a/databases/mysql55-client/patches/patch-vio_viossl.c b/databases/mysql55-client/patches/patch-vio_viossl.c new file mode 100644 index 00000000000..b0a1578f9e3 --- /dev/null +++ b/databases/mysql55-client/patches/patch-vio_viossl.c @@ -0,0 +1,15 @@ +$NetBSD: patch-vio_viossl.c,v 1.1 2013/04/20 08:06:56 adam Exp $ + +Compatibility fix. + +--- vio/viossl.c.orig 2013-04-20 07:00:23.000000000 +0000 ++++ vio/viossl.c +@@ -171,7 +171,7 @@ static int ssl_do(struct st_VioSSLFd *pt + SSL_clear(ssl); + SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); + SSL_set_fd(ssl, vio->sd); +-#ifndef HAVE_YASSL ++#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION) + SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); + #endif + diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST index 176e1a75899..f29832c5299 100644 --- a/databases/mysql55-server/PLIST +++ b/databases/mysql55-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2013/02/12 20:36:29 adam Exp $ +@comment $NetBSD: PLIST,v 1.22 2013/04/20 08:06:56 adam Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -4715,6 +4715,7 @@ share/mysql/test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result share/mysql/test/suite/sys_vars/r/innodb_autoextend_increment_basic.result share/mysql/test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result share/mysql/test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result +share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_evict_basic.result share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_instances_basic.result share/mysql/test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result share/mysql/test/suite/sys_vars/r/innodb_change_buffering_basic.result @@ -5189,6 +5190,7 @@ share/mysql/test/suite/sys_vars/t/innodb_autoextend_increment_basic.test share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt share/mysql/test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test +share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_instances_basic.test share/mysql/test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test share/mysql/test/suite/sys_vars/t/innodb_change_buffering_basic.test |