--- a/components/mysql-5-5/mysql-55test.p5m	Thu Mar 09 10:47:46 2017 -0800
+++ b/components/mysql-5-5/mysql-55test.p5m	Wed Mar 15 23:29:04 2017 -0700
@@ -18,9 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr/mysql/5.5/mysql-test/lib/My/SafeProcess/my_safe_process -> set pkg.depend.bypass-generate .*>
 set name=pkg.fmri \
     value=pkg:/database/mysql-55/tests@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="MySQL 5.5 testsuite"
@@ -1074,9 +1075,12 @@
 file path=usr/mysql/5.5/mysql-test/r/ssl.result
 file path=usr/mysql/5.5/mysql-test/r/ssl_8k_key.result
 file path=usr/mysql/5.5/mysql-test/r/ssl_and_innodb.result
+file path=usr/mysql/5.5/mysql-test/r/ssl_ca.result
 file path=usr/mysql/5.5/mysql-test/r/ssl_cipher.result
 file path=usr/mysql/5.5/mysql-test/r/ssl_compress.result
 file path=usr/mysql/5.5/mysql-test/r/ssl_connect.result
+file path=usr/mysql/5.5/mysql-test/r/ssl_mode.result
+file path=usr/mysql/5.5/mysql-test/r/ssl_mode_no_ssl.result
 file path=usr/mysql/5.5/mysql-test/r/status.result
 file path=usr/mysql/5.5/mysql-test/r/status2.result
 file path=usr/mysql/5.5/mysql-test/r/status_bug17954.result
@@ -1318,13 +1322,26 @@
 file path=usr/mysql/5.5/mysql-test/std_data/words.dat
 file path=usr/mysql/5.5/mysql-test/std_data/words2.dat
 file path=usr/mysql/5.5/mysql-test/suite/auth_sec/r/cert_verify.result
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/r/secure_file_priv_error.result
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/r/secure_file_priv_null.result
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/r/secure_file_priv_warnings.result
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/r/secure_file_priv_warnings_not_win.result
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/r/secure_file_priv_warnings_win.result
 file path=usr/mysql/5.5/mysql-test/suite/auth_sec/t/cert_verify.test
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/t/secure_file_priv_error.test
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/t/secure_file_priv_null-master.opt
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/t/secure_file_priv_null.test
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/t/secure_file_priv_warnings-master.opt
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/t/secure_file_priv_warnings.test
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_not_win.test
+file path=usr/mysql/5.5/mysql-test/suite/auth_sec/t/secure_file_priv_warnings_win.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/combinations
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_base64_flag.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_bug23533.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_bug36391.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_database.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
+file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_dmls_on_tmp_tables_readonly.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_drop_if_exists.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
 file path=usr/mysql/5.5/mysql-test/suite/binlog/r/binlog_grant.result
@@ -1403,6 +1420,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_bug36391.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_database.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
+file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_drop_if_exists.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
 file path=usr/mysql/5.5/mysql-test/suite/binlog/t/binlog_grant.test
@@ -3522,7 +3540,6 @@
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/include/setup_helper.inc
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/include/start_server_common.inc
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/include/upgrade_check.inc
-file path=usr/mysql/5.5/mysql-test/suite/perfschema/r/aggregate.result
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/r/bad_option_1.result
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/r/bad_option_2.result
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/r/bad_option_3.result
@@ -3603,7 +3620,6 @@
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/r/start_server_on.result
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/r/tampered_perfschema_table1.result
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/r/thread_cache.result
-file path=usr/mysql/5.5/mysql-test/suite/perfschema/t/aggregate.test
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/t/bad_option_1.test
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/t/bad_option_2.test
 file path=usr/mysql/5.5/mysql-test/suite/perfschema/t/bad_option_3.test
@@ -6090,10 +6106,14 @@
 file path=usr/mysql/5.5/mysql-test/t/ssl_8k_key-master.opt
 file path=usr/mysql/5.5/mysql-test/t/ssl_8k_key.test
 file path=usr/mysql/5.5/mysql-test/t/ssl_and_innodb.test
+file path=usr/mysql/5.5/mysql-test/t/ssl_ca.test
 file path=usr/mysql/5.5/mysql-test/t/ssl_cipher-master.opt
 file path=usr/mysql/5.5/mysql-test/t/ssl_cipher.test
 file path=usr/mysql/5.5/mysql-test/t/ssl_compress.test
 file path=usr/mysql/5.5/mysql-test/t/ssl_connect.test
+file path=usr/mysql/5.5/mysql-test/t/ssl_mode.test
+file path=usr/mysql/5.5/mysql-test/t/ssl_mode_no_ssl-master.opt
+file path=usr/mysql/5.5/mysql-test/t/ssl_mode_no_ssl.test
 file path=usr/mysql/5.5/mysql-test/t/status-master.opt
 file path=usr/mysql/5.5/mysql-test/t/status.test
 file path=usr/mysql/5.5/mysql-test/t/status2.test