summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql56-client/Makefile.common4
-rw-r--r--databases/mysql56-client/distinfo10
-rw-r--r--databases/mysql56-server/PLIST44
3 files changed, 49 insertions, 9 deletions
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index 1f655921b94..567f558812e 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.37 2016/10/12 16:58:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.38 2016/12/12 19:21:33 adam Exp $
#
# used by databases/mysql56-client/Makefile
# used by databases/mysql56-server/Makefile
-DISTNAME= mysql-5.6.34
+DISTNAME= mysql-5.6.35
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.6/}
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo
index 23daef249de..34571773ad9 100644
--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.39 2016/10/12 16:58:21 adam Exp $
+$NetBSD: distinfo,v 1.40 2016/12/12 19:21:33 adam Exp $
-SHA1 (mysql-5.6.34.tar.gz) = b352b44385668f0d327d3f275f33f660d85497b3
-RMD160 (mysql-5.6.34.tar.gz) = 4095f4276623432d235211a445b5d5f540658b2d
-SHA512 (mysql-5.6.34.tar.gz) = 2395455d6b62161695b6923a3da05480f5a6044e695adf3619459655adbfa63e9c82abbbe20f2ba1096a5900bb850af8b5b3a9306526fceb42f4479bae5dd6f2
-Size (mysql-5.6.34.tar.gz) = 32094762 bytes
+SHA1 (mysql-5.6.35.tar.gz) = a971f01d711addd87c860fb534d51139a73d5319
+RMD160 (mysql-5.6.35.tar.gz) = 3a54baba27b940b5c18787a6d213e1cc6530ea28
+SHA512 (mysql-5.6.35.tar.gz) = 106c4b05c52cd2bb5378376e4a453aeb55eda0adce527862c435068597c3e60f44e3c64476011befefd688e6fdf30f2245e28320d57d9fccbb2415d87498e7f2
+Size (mysql-5.6.35.tar.gz) = 32167628 bytes
SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index f39f08dbf0e..6c4fed31f23 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2016/10/12 16:58:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2016/12/12 19:21:33 adam Exp $
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
@@ -20,6 +20,7 @@ lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth.so
${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so
lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/connection_control.so
lib/mysql/plugin/daemon_example.ini
${PLIST.sphinx}lib/mysql/plugin/ha_sphinx.so
${PLIST.memcached}lib/mysql/plugin/innodb_engine.so
@@ -1731,7 +1732,6 @@ share/mysql/test/std_data/bug17532932.frm
share/mysql/test/std_data/bug19371.MYD
share/mysql/test/std_data/bug19371.MYI
share/mysql/test/std_data/bug19371.frm
-share/mysql/test/std_data/bug20683959loaddata.txt
share/mysql/test/std_data/bug30435_10k_items.txt
share/mysql/test/std_data/bug30435_5k.txt
share/mysql/test/std_data/bug33029-slave-relay-bin.000001
@@ -2175,6 +2175,39 @@ share/mysql/test/suite/binlog/t/binlog_write_error.test
share/mysql/test/suite/binlog/t/binlog_xa_handling.test
share/mysql/test/suite/binlog/t/disabled.def
share/mysql/test/suite/binlog/t/show_binlog_events_no_lock.test
+share/mysql/test/suite/connection_control/inc/check_connection_delay.inc
+share/mysql/test/suite/connection_control/inc/cleanup_proxy_accounts.inc
+share/mysql/test/suite/connection_control/inc/have_connection_control_plugin.inc
+share/mysql/test/suite/connection_control/inc/have_test_plugin.inc
+share/mysql/test/suite/connection_control/inc/install_connection_control_plugin.inc
+share/mysql/test/suite/connection_control/inc/set_after_marker.inc
+share/mysql/test/suite/connection_control/inc/set_before_marker.inc
+share/mysql/test/suite/connection_control/inc/setup_proxy_accounts.inc
+share/mysql/test/suite/connection_control/inc/uninstall_connection_control_plugin.inc
+share/mysql/test/suite/connection_control/r/connection_delay_anonymous_user.result
+share/mysql/test/suite/connection_control/r/connection_delay_info_schema_view.result
+share/mysql/test/suite/connection_control/r/connection_delay_invalid_users.result
+share/mysql/test/suite/connection_control/r/connection_delay_min_max.result
+share/mysql/test/suite/connection_control/r/connection_delay_proxy_users.result
+share/mysql/test/suite/connection_control/r/connection_delay_valid_users.result
+share/mysql/test/suite/connection_control/r/status_variables.result
+share/mysql/test/suite/connection_control/r/system_variables.result
+share/mysql/test/suite/connection_control/t/connection_delay_anonymous_user-master.opt
+share/mysql/test/suite/connection_control/t/connection_delay_anonymous_user.test
+share/mysql/test/suite/connection_control/t/connection_delay_info_schema_view-master.opt
+share/mysql/test/suite/connection_control/t/connection_delay_info_schema_view.test
+share/mysql/test/suite/connection_control/t/connection_delay_invalid_users-master.opt
+share/mysql/test/suite/connection_control/t/connection_delay_invalid_users.test
+share/mysql/test/suite/connection_control/t/connection_delay_min_max-master.opt
+share/mysql/test/suite/connection_control/t/connection_delay_min_max.test
+share/mysql/test/suite/connection_control/t/connection_delay_proxy_users-master.opt
+share/mysql/test/suite/connection_control/t/connection_delay_proxy_users.test
+share/mysql/test/suite/connection_control/t/connection_delay_valid_users-master.opt
+share/mysql/test/suite/connection_control/t/connection_delay_valid_users.test
+share/mysql/test/suite/connection_control/t/status_variables-master.opt
+share/mysql/test/suite/connection_control/t/status_variables.test
+share/mysql/test/suite/connection_control/t/system_variables-master.opt
+share/mysql/test/suite/connection_control/t/system_variables.test
share/mysql/test/suite/engines/README
share/mysql/test/suite/engines/funcs/r/ai_init_alter_table.result
share/mysql/test/suite/engines/funcs/r/ai_init_create_table.result
@@ -3474,6 +3507,7 @@ share/mysql/test/suite/innodb/include/innodb_stats_table_flag_analyze.inc
share/mysql/test/suite/innodb/r/add_foreign_key.result
share/mysql/test/suite/innodb/r/alter_rename_existing.result
share/mysql/test/suite/innodb/r/analyze_table.result
+share/mysql/test/suite/innodb/r/autoinc_debug.result
share/mysql/test/suite/innodb/r/blob-update-debug.result
share/mysql/test/suite/innodb/r/blob_redo.result
share/mysql/test/suite/innodb/r/checksum.result
@@ -3641,6 +3675,7 @@ share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc_lots.result
share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc_on_nonexistent.result
share/mysql/test/suite/innodb/r/innodb_stats_create_on_corrupted.result
share/mysql/test/suite/innodb/r/innodb_stats_create_table.result
+share/mysql/test/suite/innodb/r/innodb_stats_del_mark.result
share/mysql/test/suite/innodb/r/innodb_stats_drop_locked.result
share/mysql/test/suite/innodb/r/innodb_stats_external_pages.result
share/mysql/test/suite/innodb/r/innodb_stats_fetch.result
@@ -3668,6 +3703,7 @@ share/mysql/test/suite/innodb/r/xa_recovery.result
share/mysql/test/suite/innodb/t/add_foreign_key.test
share/mysql/test/suite/innodb/t/alter_rename_existing.test
share/mysql/test/suite/innodb/t/analyze_table.test
+share/mysql/test/suite/innodb/t/autoinc_debug.test
share/mysql/test/suite/innodb/t/blob-update-debug.test
share/mysql/test/suite/innodb/t/blob_redo-master.opt
share/mysql/test/suite/innodb/t/blob_redo.test
@@ -3871,6 +3907,8 @@ share/mysql/test/suite/innodb/t/innodb_stats_auto_recalc_lots.test
share/mysql/test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.test
share/mysql/test/suite/innodb/t/innodb_stats_create_on_corrupted.test
share/mysql/test/suite/innodb/t/innodb_stats_create_table.test
+share/mysql/test/suite/innodb/t/innodb_stats_del_mark-master.opt
+share/mysql/test/suite/innodb/t/innodb_stats_del_mark.test
share/mysql/test/suite/innodb/t/innodb_stats_drop_locked.test
share/mysql/test/suite/innodb/t/innodb_stats_external_pages.test
share/mysql/test/suite/innodb/t/innodb_stats_fetch.test
@@ -7817,6 +7855,7 @@ share/mysql/test/suite/sys_vars/r/innodb_saved_page_number_debug_basic.result
share/mysql/test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result
share/mysql/test/suite/sys_vars/r/innodb_spin_wait_delay_basic.result
share/mysql/test/suite/sys_vars/r/innodb_stats_auto_recalc_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_stats_include_delete_marked_basic.result
share/mysql/test/suite/sys_vars/r/innodb_stats_method_basic.result
share/mysql/test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
share/mysql/test/suite/sys_vars/r/innodb_stats_persistent_basic.result
@@ -8432,6 +8471,7 @@ share/mysql/test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test
share/mysql/test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test
share/mysql/test/suite/sys_vars/t/innodb_spin_wait_delay_basic.test
share/mysql/test/suite/sys_vars/t/innodb_stats_auto_recalc_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_stats_include_delete_marked_basic.test
share/mysql/test/suite/sys_vars/t/innodb_stats_method_basic.test
share/mysql/test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
share/mysql/test/suite/sys_vars/t/innodb_stats_persistent_basic.test