--- a/components/mysql-5-5/Makefile	Fri Mar 11 09:03:02 2016 -0800
+++ b/components/mysql-5-5/Makefile	Fri Mar 11 10:00:16 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 export PARFAIT_BUILD=no
@@ -26,26 +26,33 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME        = mysql
-COMPONENT_VERSION     = 5.5.43
+COMPONENT_VERSION     = 5.5.48
 COMPONENT_SRC         = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE     = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:43d3df79e5c839a2749deb6e056a4589e49c903e09034c18653ec56e6e4774cd
-COMPONENT_ARCHIVE_URL = http://downloads.mysql.com/archives/mysql-5.5/$(COMPONENT_ARCHIVE)
+    sha256:cc3f8745879eee0508de1a70fc2d267a2d06b7433faa8bb07a787768dcfed781
+COMPONENT_ARCHIVE_URL = http://cdn.mysql.com/Downloads/MySQL-5.5/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL = http://dev.mysql.com/ 
 COMPONENT_BUGDB       = database/mysql
 
+# MySQL doesn't like cloning
+CLONEY = echo
+COMPONENT_PRE_BUILD_ACTION += \
+  $(CP) -rp $(SOURCE_DIR)/* $(@D);
+
 include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/justmake.mk
 include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/cmake.mk
+
+# Remove "-z ignore" to avoid link problem, missing C++ runtime
+# references in libmysqlclient.so
+LD_Z_IGNORE =
 
 # Enable ASLR for this component
 ASLR_MODE           = $(ASLR_ENABLE)
 
-
 # This component uses cmake to generate Makefiles and thus does not
 # run any configure script
-CMAKE               = $(shell which cmake)
 CMAKE_PREFIX        = /usr/mysql/5.5
 CONFDIR             = /etc/mysql/5.5
 DATA_PREFIX         = /var/mysql/5.5
@@ -82,35 +89,25 @@
 CMAKE_OPTIONS += -DWITH_EXAMPLE_STORAGE_ENGINE=1
 CMAKE_OPTIONS += -DWITH_FEDERATED_STORAGE_ENGINE=1
 CMAKE_OPTIONS += -DWITH_INNOBASE_STORAGE_ENGINE=1
-CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX) 
-CMAKE_OPTIONS += -DCMAKE_C_COMPILER=$(CC)
 CMAKE_OPTIONS += -DCMAKE_EXE_LINKER_FLAGS="-norunpath"
 CMAKE_OPTIONS += -DCMAKE_C_FLAGS=$(CMAKE_CFLAGS.$(BITS))
 CMAKE_OPTIONS += -DCMAKE_CXX_FLAGS=$(CMAKE_CXXFLAGS.$(BITS))
 CMAKE_OPTIONS += '-DCOMPILATION_COMMENT=MySQL Community Server (GPL)'
 CMAKE_OPTIONS += -DFEATURE_SET=community
 
-COMPONENT_PRE_BUILD_ACTION += cd $(@D);
-COMPONENT_PRE_BUILD_ACTION += export LDFLAGS=$(CMAKE_CXXFLAGS.$(BITS));
-COMPONENT_PRE_BUILD_ACTION += echo Running cmake with $(CMAKE_OPTIONS);
-COMPONENT_PRE_BUILD_ACTION += $(CMAKE) . $(CMAKE_OPTIONS);
-
 build: $(BUILD_32_and_64)
 
 install: $(INSTALL_32_and_64)
 
 test: $(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test: $(NO_TESTS)
 
-
-REQUIRED_PACKAGES += developer/build/cmake
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/c++-runtime
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/network

--- a/components/mysql-5-5/mysql-55.p5m	Fri Mar 11 09:03:02 2016 -0800
+++ b/components/mysql-5-5/mysql-55.p5m	Fri Mar 11 10:00:16 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -160,6 +160,7 @@
 file path=usr/mysql/5.5/man/man1/myisamlog.1
 file path=usr/mysql/5.5/man/man1/myisampack.1
 file path=usr/mysql/5.5/man/man1/mysql-stress-test.pl.1
+file path=usr/mysql/5.5/man/man1/mysql-test-run.pl.1
 file path=usr/mysql/5.5/man/man1/mysql.server.1
 file path=usr/mysql/5.5/man/man1/mysql_config.1
 file path=usr/mysql/5.5/man/man1/mysql_convert_table_format.1
@@ -170,6 +171,7 @@
 file path=usr/mysql/5.5/man/man1/mysql_tzinfo_to_sql.1
 file path=usr/mysql/5.5/man/man1/mysql_upgrade.1
 file path=usr/mysql/5.5/man/man1/mysql_zap.1
+file path=usr/mysql/5.5/man/man1/mysqlbug.1
 file path=usr/mysql/5.5/man/man1/mysqld_multi.1
 file path=usr/mysql/5.5/man/man1/mysqld_safe.1
 file path=usr/mysql/5.5/man/man1/mysqlhotcopy.1

--- a/components/mysql-5-5/mysql-55test.p5m	Fri Mar 11 09:03:02 2016 -0800
+++ b/components/mysql-5-5/mysql-55test.p5m	Fri Mar 11 10:00:16 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -641,6 +641,7 @@
 file path=usr/mysql/5.5/mysql-test/r/drop.result
 file path=usr/mysql/5.5/mysql-test/r/drop_debug.result
 file path=usr/mysql/5.5/mysql-test/r/empty_table.result
+file path=usr/mysql/5.5/mysql-test/r/enable_cleartext_plugin.result
 file path=usr/mysql/5.5/mysql-test/r/endspace.result
 file path=usr/mysql/5.5/mysql-test/r/error_simulation.result
 file path=usr/mysql/5.5/mysql-test/r/errors.result
@@ -764,6 +765,7 @@
 file path=usr/mysql/5.5/mysql-test/r/have_sjis.require
 file path=usr/mysql/5.5/mysql-test/r/have_ssl.require
 file path=usr/mysql/5.5/mysql-test/r/have_ssl_is_yes_or_disabled_only.require
+file path=usr/mysql/5.5/mysql-test/r/have_symlink.require
 file path=usr/mysql/5.5/mysql-test/r/have_tis620.require
 file path=usr/mysql/5.5/mysql-test/r/have_ucs2.require
 file path=usr/mysql/5.5/mysql-test/r/have_ujis.require
@@ -839,11 +841,11 @@
 file path=usr/mysql/5.5/mysql-test/r/lowercase1.require
 file path=usr/mysql/5.5/mysql-test/r/lowercase2.require
 file path=usr/mysql/5.5/mysql-test/r/lowercase_fs_off.result
+file path=usr/mysql/5.5/mysql-test/r/lowercase_fs_on.result
 file path=usr/mysql/5.5/mysql-test/r/lowercase_mixed_tmpdir.result
 file path=usr/mysql/5.5/mysql-test/r/lowercase_mixed_tmpdir_innodb.result
 file path=usr/mysql/5.5/mysql-test/r/lowercase_table.result
 file path=usr/mysql/5.5/mysql-test/r/lowercase_table2.result
-file path=usr/mysql/5.5/mysql-test/r/lowercase_table3.result
 file path=usr/mysql/5.5/mysql-test/r/lowercase_table4.result
 file path=usr/mysql/5.5/mysql-test/r/lowercase_table_grant.result
 file path=usr/mysql/5.5/mysql-test/r/lowercase_table_qcache.result
@@ -854,7 +856,6 @@
 file path=usr/mysql/5.5/mysql-test/r/merge.result
 file path=usr/mysql/5.5/mysql-test/r/merge_innodb.result
 file path=usr/mysql/5.5/mysql-test/r/merge_mmap.result
-file path=usr/mysql/5.5/mysql-test/r/merge_recover.result
 file path=usr/mysql/5.5/mysql-test/r/metadata.result
 file path=usr/mysql/5.5/mysql-test/r/mix2_myisam.result
 file path=usr/mysql/5.5/mysql-test/r/mix2_myisam_ucs2.result
@@ -868,6 +869,7 @@
 file path=usr/mysql/5.5/mysql-test/r/myisam.result
 file path=usr/mysql/5.5/mysql-test/r/myisam_crash_before_flush_keys.result
 file path=usr/mysql/5.5/mysql-test/r/myisam_debug.result
+file path=usr/mysql/5.5/mysql-test/r/myisam_recover.result
 file path=usr/mysql/5.5/mysql-test/r/myisampack.result
 file path=usr/mysql/5.5/mysql-test/r/mysql-bug41486.result
 file path=usr/mysql/5.5/mysql-test/r/mysql-bug45236.result
@@ -968,6 +970,7 @@
 file path=usr/mysql/5.5/mysql-test/r/partition_pruning.result
 file path=usr/mysql/5.5/mysql-test/r/partition_range.result
 file path=usr/mysql/5.5/mysql-test/r/partition_rename_longfilename.result
+file path=usr/mysql/5.5/mysql-test/r/partition_symlink.result
 file path=usr/mysql/5.5/mysql-test/r/partition_sync.result
 file path=usr/mysql/5.5/mysql-test/r/partition_truncate.result
 file path=usr/mysql/5.5/mysql-test/r/partition_utf8.result
@@ -1091,6 +1094,7 @@
 file path=usr/mysql/5.5/mysql-test/r/subselect_notembedded.result
 file path=usr/mysql/5.5/mysql-test/r/sum_distinct-big.result
 file path=usr/mysql/5.5/mysql-test/r/sum_distinct.result
+file path=usr/mysql/5.5/mysql-test/r/symlink.result
 file path=usr/mysql/5.5/mysql-test/r/synchronization.result
 file path=usr/mysql/5.5/mysql-test/r/sysdate_is_now.result
 file path=usr/mysql/5.5/mysql-test/r/system_mysql_db.result
@@ -1163,6 +1167,8 @@
 file path=usr/mysql/5.5/mysql-test/std_data/binlog_transaction.000001
 file path=usr/mysql/5.5/mysql-test/std_data/bug11747416_32228_binlog.000001
 file path=usr/mysql/5.5/mysql-test/std_data/bug15328.cnf
+file path=usr/mysql/5.5/mysql-test/std_data/bug16171518_1.dat
+file path=usr/mysql/5.5/mysql-test/std_data/bug16171518_2.dat
 file path=usr/mysql/5.5/mysql-test/std_data/bug16266.000001
 file path=usr/mysql/5.5/mysql-test/std_data/bug19371.MYD
 file path=usr/mysql/5.5/mysql-test/std_data/bug19371.MYI
@@ -1190,6 +1196,7 @@
 file path=usr/mysql/5.5/mysql-test/std_data/bug49823.CSM
 file path=usr/mysql/5.5/mysql-test/std_data/bug49823.CSV
 file path=usr/mysql/5.5/mysql-test/std_data/bug49823.frm
+file path=usr/mysql/5.5/mysql-test/std_data/ca-cert-verify.pem
 file path=usr/mysql/5.5/mysql-test/std_data/cacert.pem
 file path=usr/mysql/5.5/mysql-test/std_data/charset_utf8.txt
 file path=usr/mysql/5.5/mysql-test/std_data/checkDBI_DBD-mysql.pl
@@ -1296,7 +1303,11 @@
 file path=usr/mysql/5.5/mysql-test/std_data/rpl_mixed.dat
 file path=usr/mysql/5.5/mysql-test/std_data/rpl_timezone.dat
 file path=usr/mysql/5.5/mysql-test/std_data/rpl_timezone2.dat
+file path=usr/mysql/5.5/mysql-test/std_data/server-cert-verify-fail.pem
+file path=usr/mysql/5.5/mysql-test/std_data/server-cert-verify-pass.pem
 file path=usr/mysql/5.5/mysql-test/std_data/server-cert.pem
+file path=usr/mysql/5.5/mysql-test/std_data/server-key-verify-fail.pem
+file path=usr/mysql/5.5/mysql-test/std_data/server-key-verify-pass.pem
 file path=usr/mysql/5.5/mysql-test/std_data/server-key.pem
 file path=usr/mysql/5.5/mysql-test/std_data/server8k-cert.pem
 file path=usr/mysql/5.5/mysql-test/std_data/server8k-key.pem
@@ -1306,6 +1317,8 @@
 file path=usr/mysql/5.5/mysql-test/std_data/warnings_loaddata.dat
 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/t/cert_verify.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
@@ -2753,8 +2766,10 @@
 file path=usr/mysql/5.5/mysql-test/suite/funcs_2/t/memory_charset.test
 file path=usr/mysql/5.5/mysql-test/suite/funcs_2/t/myisam_charset.test
 file path=usr/mysql/5.5/mysql-test/suite/funcs_2/t/suite.opt
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/add_constraint.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/blob-update-debug.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/create-index.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/dropdb.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/foreign-keys.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/foreign-keys.result.moved
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/innodb-analyze.result
@@ -2857,9 +2872,12 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/insert_debug.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/sp_temp_table.result
 file path=usr/mysql/5.5/mysql-test/suite/innodb/r/strict_mode.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/r/xa_recovery.result
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/add_constraint.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/blob-update-debug.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/create-index.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/disabled.def
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/dropdb.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/foreign-keys.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/foreign-keys.test.moved
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb-analyze.test
@@ -2963,7 +2981,6 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug60049.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug60196-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug60196.test
-file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug60229-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_bug60229.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_corrupt_bit.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/innodb_file_format-master.opt
@@ -2989,6 +3006,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/insert_debug.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/sp_temp_table.test
 file path=usr/mysql/5.5/mysql-test/suite/innodb/t/strict_mode.test
+file path=usr/mysql/5.5/mysql-test/suite/innodb/t/xa_recovery.test
 dir  path=usr/mysql/5.5/mysql-test/suite/innodb_zip
 dir  path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r
 file path=usr/mysql/5.5/mysql-test/suite/innodb_zip/r/innodb-create-options.result
@@ -3163,13 +3181,9 @@
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
-file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_enum_sjis-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_enum_sjis.test
-file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_enum_ucs2.test
-file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_enum_ujis-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_enum_ujis.test
-file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_enum_utf8-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_enum_utf8.test
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_insert_sjis.test
 file path=usr/mysql/5.5/mysql-test/suite/jp/t/jp_insert_ucs2.test
@@ -3265,6 +3279,8 @@
 file path=usr/mysql/5.5/mysql-test/suite/manual/r/rpl_replication_delay.result
 file path=usr/mysql/5.5/mysql-test/suite/manual/t/rpl_replication_delay-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/manual/t/rpl_replication_delay.test
+file path=usr/mysql/5.5/mysql-test/suite/ndb/r/ndb_restore_discover.result
+file path=usr/mysql/5.5/mysql-test/suite/ndb/t/ndb_restore_discover.test
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/methods1.inc
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
@@ -3287,6 +3303,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/partition_alter_41.inc
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/partition_auto_increment.inc
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/partition_basic.inc
+file path=usr/mysql/5.5/mysql-test/suite/parts/inc/partition_basic_symlink.inc
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/partition_bigint.inc
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/partition_binary.inc
 file path=usr/mysql/5.5/mysql-test/suite/parts/inc/partition_bit.inc
@@ -3373,6 +3390,8 @@
 file path=usr/mysql/5.5/mysql-test/suite/parts/r/partition_auto_increment_myisam.result
 file path=usr/mysql/5.5/mysql-test/suite/parts/r/partition_basic_innodb.result
 file path=usr/mysql/5.5/mysql-test/suite/parts/r/partition_basic_myisam.result
+file path=usr/mysql/5.5/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
+file path=usr/mysql/5.5/mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
 file path=usr/mysql/5.5/mysql-test/suite/parts/r/partition_bit_innodb.result
 file path=usr/mysql/5.5/mysql-test/suite/parts/r/partition_bit_myisam.result
 file path=usr/mysql/5.5/mysql-test/suite/parts/r/partition_char_innodb.result
@@ -3442,6 +3461,8 @@
 file path=usr/mysql/5.5/mysql-test/suite/parts/t/partition_auto_increment_myisam.test
 file path=usr/mysql/5.5/mysql-test/suite/parts/t/partition_basic_innodb.test
 file path=usr/mysql/5.5/mysql-test/suite/parts/t/partition_basic_myisam.test
+file path=usr/mysql/5.5/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test
+file path=usr/mysql/5.5/mysql-test/suite/parts/t/partition_basic_symlink_myisam.test
 file path=usr/mysql/5.5/mysql-test/suite/parts/t/partition_bit_innodb.test
 file path=usr/mysql/5.5/mysql-test/suite/parts/t/partition_bit_myisam.test
 file path=usr/mysql/5.5/mysql-test/suite/parts/t/partition_char_innodb.test
@@ -3728,6 +3749,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_binlog_errors.result
@@ -3820,6 +3842,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_loaddata_map.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_loaddata_s.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_loaddata_simple.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_loaddata_symlink.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_loaddatalocal.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_loadfile.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_locale.result
@@ -4013,6 +4036,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_typeconv.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_udf.result
+file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_unsafe_statements.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_user.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_user_variables.result
 file path=usr/mysql/5.5/mysql-test/suite/rpl/r/rpl_variables.result
@@ -4037,6 +4061,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
@@ -4177,6 +4202,11 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddata_s.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddata_simple.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.opt
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.opt
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loaddatalocal.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_loadfile.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_locale.test
@@ -4430,6 +4460,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_udf-master.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_udf-slave.opt
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_udf.test
+file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_unsafe_statements.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_user.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_user_variables.test
 file path=usr/mysql/5.5/mysql-test/suite/rpl/t/rpl_variables.test
@@ -4586,6 +4617,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/have_query_cache_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/have_ssl_basic.result
+file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/have_symlink_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/hostname_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/identity_basic.result
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/r/identity_func.result
@@ -5056,6 +5088,7 @@
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/have_query_cache_basic.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/have_ssl_basic.test
+file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/have_symlink_basic.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/hostname_basic.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/identity_basic.test
 file path=usr/mysql/5.5/mysql-test/suite/sys_vars/t/identity_func-master.opt
@@ -5605,6 +5638,8 @@
 file path=usr/mysql/5.5/mysql-test/t/drop.test
 file path=usr/mysql/5.5/mysql-test/t/drop_debug.test
 file path=usr/mysql/5.5/mysql-test/t/empty_table.test
+file path=usr/mysql/5.5/mysql-test/t/enable_cleartext_plugin-master.opt
+file path=usr/mysql/5.5/mysql-test/t/enable_cleartext_plugin.test
 file path=usr/mysql/5.5/mysql-test/t/endspace.test
 file path=usr/mysql/5.5/mysql-test/t/error_simulation-master.opt
 file path=usr/mysql/5.5/mysql-test/t/error_simulation.test
@@ -5779,6 +5814,7 @@
 file path=usr/mysql/5.5/mysql-test/t/long_tmpdir-master.sh
 file path=usr/mysql/5.5/mysql-test/t/long_tmpdir.test
 file path=usr/mysql/5.5/mysql-test/t/lowercase_fs_off.test
+file path=usr/mysql/5.5/mysql-test/t/lowercase_fs_on.test
 file path=usr/mysql/5.5/mysql-test/t/lowercase_mixed_tmpdir-master.opt
 file path=usr/mysql/5.5/mysql-test/t/lowercase_mixed_tmpdir-master.sh
 file path=usr/mysql/5.5/mysql-test/t/lowercase_mixed_tmpdir.test
@@ -5788,8 +5824,6 @@
 file path=usr/mysql/5.5/mysql-test/t/lowercase_table-master.opt
 file path=usr/mysql/5.5/mysql-test/t/lowercase_table.test
 file path=usr/mysql/5.5/mysql-test/t/lowercase_table2.test
-file path=usr/mysql/5.5/mysql-test/t/lowercase_table3-master.opt
-file path=usr/mysql/5.5/mysql-test/t/lowercase_table3.test
 file path=usr/mysql/5.5/mysql-test/t/lowercase_table4-master.opt
 file path=usr/mysql/5.5/mysql-test/t/lowercase_table4.test
 file path=usr/mysql/5.5/mysql-test/t/lowercase_table_grant-master.opt
@@ -5807,8 +5841,6 @@
 file path=usr/mysql/5.5/mysql-test/t/merge_innodb.test
 file path=usr/mysql/5.5/mysql-test/t/merge_mmap-master.opt
 file path=usr/mysql/5.5/mysql-test/t/merge_mmap.test
-file path=usr/mysql/5.5/mysql-test/t/merge_recover-master.opt
-file path=usr/mysql/5.5/mysql-test/t/merge_recover.test
 file path=usr/mysql/5.5/mysql-test/t/metadata.test
 file path=usr/mysql/5.5/mysql-test/t/mix2_myisam.test
 file path=usr/mysql/5.5/mysql-test/t/mix2_myisam_ucs2.test
@@ -5828,6 +5860,8 @@
 file path=usr/mysql/5.5/mysql-test/t/myisam_crash_before_flush_keys-master.opt
 file path=usr/mysql/5.5/mysql-test/t/myisam_crash_before_flush_keys.test
 file path=usr/mysql/5.5/mysql-test/t/myisam_debug.test
+file path=usr/mysql/5.5/mysql-test/t/myisam_recover-master.opt
+file path=usr/mysql/5.5/mysql-test/t/myisam_recover.test
 file path=usr/mysql/5.5/mysql-test/t/myisampack.test
 file path=usr/mysql/5.5/mysql-test/t/mysql-bug41486.test
 file path=usr/mysql/5.5/mysql-test/t/mysql-bug45236.test
@@ -5940,6 +5974,7 @@
 file path=usr/mysql/5.5/mysql-test/t/partition_pruning.test
 file path=usr/mysql/5.5/mysql-test/t/partition_range.test
 file path=usr/mysql/5.5/mysql-test/t/partition_rename_longfilename.test
+file path=usr/mysql/5.5/mysql-test/t/partition_symlink.test
 file path=usr/mysql/5.5/mysql-test/t/partition_sync.test
 file path=usr/mysql/5.5/mysql-test/t/partition_truncate.test
 file path=usr/mysql/5.5/mysql-test/t/partition_utf8.test
@@ -6078,6 +6113,7 @@
 file path=usr/mysql/5.5/mysql-test/t/subselect_notembedded.test
 file path=usr/mysql/5.5/mysql-test/t/sum_distinct-big.test
 file path=usr/mysql/5.5/mysql-test/t/sum_distinct.test
+file path=usr/mysql/5.5/mysql-test/t/symlink.test
 file path=usr/mysql/5.5/mysql-test/t/synchronization.test
 file path=usr/mysql/5.5/mysql-test/t/sysdate_is_now-master.opt
 file path=usr/mysql/5.5/mysql-test/t/sysdate_is_now.test