--- a/components/mysql-5-6/Makefile	Wed Jan 25 21:05:11 2017 -0800
+++ b/components/mysql-5-6/Makefile	Wed Jan 25 21:10:42 2017 -0800
@@ -20,19 +20,19 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64_and_32
 export PARFAIT_BUILD=no
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME        = mysql
-COMPONENT_VERSION     = 5.6.33
+COMPONENT_VERSION     = 5.6.35
 COMPONENT_SRC         = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE     = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-         sha256:60776ec27d78b59f597e71738c5bcdea64dcba33c36fede320d5930320b1fef0
-COMPONENT_ARCHIVE_URL = http://cdn.mysql.com/archives/mysql-5.6/$(COMPONENT_ARCHIVE)
+         sha256:dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020
+COMPONENT_ARCHIVE_URL = http://cdn.mysql.com/Downloads/MySQL-5.6/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL = http://dev.mysql.com/ 
 COMPONENT_BUGDB       = database/mysql
 

--- a/components/mysql-5-6/mysql-56.p5m	Wed Jan 25 21:05:11 2017 -0800
+++ b/components/mysql-5-6/mysql-56.p5m	Wed Jan 25 21:10:42 2017 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -149,6 +149,7 @@
 file path=usr/mysql/5.6/lib/$(MACH64)/plugin/adt_null.so
 file path=usr/mysql/5.6/lib/$(MACH64)/plugin/auth.so
 file path=usr/mysql/5.6/lib/$(MACH64)/plugin/auth_test_plugin.so
+file path=usr/mysql/5.6/lib/$(MACH64)/plugin/connection_control.so
 file path=usr/mysql/5.6/lib/$(MACH64)/plugin/daemon_example.ini
 file path=usr/mysql/5.6/lib/$(MACH64)/plugin/ha_example.so
 file path=usr/mysql/5.6/lib/$(MACH64)/plugin/libdaemon_example.so
@@ -165,6 +166,7 @@
 file path=usr/mysql/5.6/lib/plugin/adt_null.so
 file path=usr/mysql/5.6/lib/plugin/auth.so
 file path=usr/mysql/5.6/lib/plugin/auth_test_plugin.so
+file path=usr/mysql/5.6/lib/plugin/connection_control.so
 file path=usr/mysql/5.6/lib/plugin/daemon_example.ini
 file path=usr/mysql/5.6/lib/plugin/ha_example.so
 file path=usr/mysql/5.6/lib/plugin/libdaemon_example.so

--- a/components/mysql-5-6/mysql-56test.p5m	Wed Jan 25 21:05:11 2017 -0800
+++ b/components/mysql-5-6/mysql-56test.p5m	Wed Jan 25 21:10:42 2017 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -1596,7 +1596,6 @@
 file path=usr/mysql/5.6/mysql-test/std_data/bug19371.MYD
 file path=usr/mysql/5.6/mysql-test/std_data/bug19371.MYI
 file path=usr/mysql/5.6/mysql-test/std_data/bug19371.frm
-file path=usr/mysql/5.6/mysql-test/std_data/bug20683959loaddata.txt
 file path=usr/mysql/5.6/mysql-test/std_data/bug30435_10k_items.txt
 file path=usr/mysql/5.6/mysql-test/std_data/bug30435_5k.txt
 file path=usr/mysql/5.6/mysql-test/std_data/bug33029-slave-relay-bin.000001
@@ -1763,6 +1762,11 @@
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/not_ssl.require
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/openssl.require
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/password_expired.result
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/secure_file_priv_error.result
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/secure_file_priv_null.result
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/secure_file_priv_warnings.result
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/secure_file_priv_warnings_not_win.result
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/secure_file_priv_warnings_win.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/server_withoutssl_client_withoutssl.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/server_withoutssl_client_withssl.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/server_withssl_client_withoutssl.result
@@ -1784,6 +1788,11 @@
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_sha256_plugin.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/password_expired-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/password_expired.test
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/secure_file_priv_error.test
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/secure_file_priv_null.test
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/secure_file_priv_warnings.test
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_not_win.test
+file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_win.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/server_withoutssl_client_withoutssl.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/server_withoutssl_client_withssl.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/server_withssl_client_withoutssl-master.opt
@@ -2030,6 +2039,39 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_xa_handling.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/disabled.def
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/show_binlog_events_no_lock.test
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/check_connection_delay.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/cleanup_proxy_accounts.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/have_connection_control_plugin.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/have_test_plugin.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/install_connection_control_plugin.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/set_after_marker.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/set_before_marker.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/setup_proxy_accounts.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/inc/uninstall_connection_control_plugin.inc
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/r/connection_delay_anonymous_user.result
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/r/connection_delay_info_schema_view.result
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/r/connection_delay_invalid_users.result
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/r/connection_delay_min_max.result
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/r/connection_delay_proxy_users.result
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/r/connection_delay_valid_users.result
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/r/status_variables.result
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/r/system_variables.result
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_anonymous_user-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_anonymous_user.test
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_info_schema_view-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_info_schema_view.test
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_invalid_users-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_invalid_users.test
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_min_max-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_min_max.test
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_proxy_users-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_proxy_users.test
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_valid_users-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/connection_delay_valid_users.test
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/status_variables-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/status_variables.test
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/system_variables-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/connection_control/t/system_variables.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/README
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/r/ai_init_alter_table.result
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/r/ai_init_create_table.result
@@ -3329,6 +3371,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/add_foreign_key.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/alter_rename_existing.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/analyze_table.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/autoinc_debug.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/blob-update-debug.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/blob_redo.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/checksum.result
@@ -3496,6 +3539,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_stats_auto_recalc_on_nonexistent.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_stats_create_on_corrupted.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_stats_create_table.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_stats_del_mark.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_stats_drop_locked.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_stats_external_pages.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_stats_fetch.result
@@ -3523,6 +3567,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/add_foreign_key.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/alter_rename_existing.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/analyze_table.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/autoinc_debug.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob-update-debug.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob_redo-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob_redo.test
@@ -3726,6 +3771,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_stats_create_on_corrupted.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_stats_create_table.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_stats_del_mark-master.opt
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_stats_del_mark.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_stats_drop_locked.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_stats_external_pages.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_stats_fetch.test
@@ -7673,6 +7720,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_spin_wait_delay_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_stats_auto_recalc_basic.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_stats_include_delete_marked_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_stats_method_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_stats_persistent_basic.result
@@ -8288,6 +8336,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_spin_wait_delay_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_stats_auto_recalc_basic.test
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_stats_include_delete_marked_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_stats_method_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_stats_persistent_basic.test