--- a/components/mysql-5-5/Makefile	Thu Mar 09 10:47:46 2017 -0800
+++ b/components/mysql-5-5/Makefile	Wed Mar 15 23:29:04 2017 -0700
@@ -18,33 +18,29 @@
 #
 # 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.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME        = mysql
-COMPONENT_VERSION     = 5.5.48
+COMPONENT_VERSION     = 5.5.54
 COMPONENT_SRC         = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE     = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:cc3f8745879eee0508de1a70fc2d267a2d06b7433faa8bb07a787768dcfed781
+    sha256:273bcbcf8cc84061eb07c359308563b2029eb3f70f78b558905bc1b5c5791ab8
 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
+# We use cp(1) instead of cloney because we use TAR to copy files and the TAR 
+# used doesn't handle long links
 CLONEY = echo
-COMPONENT_PRE_BUILD_ACTION += \
-  $(CP) -rp $(SOURCE_DIR)/* $(@D);
+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
 
-# 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)
 
@@ -61,8 +57,10 @@
 CMAKE_LIBDIR.64     = lib/$(MACH64)
 CMAKE_PLUGINDIR.32  = lib/plugin
 CMAKE_PLUGINDIR.64  = lib/$(MACH64)/plugin
+CMAKE_CFLAGS.32     = -m32
 CMAKE_CFLAGS.64     = -m64
-CMAKE_CXXFLAGS.64   = -m64
+CMAKE_CXXFLAGS.32   = "-m32 -norunpath"
+CMAKE_CXXFLAGS.64   = "-m64 -norunpath"
 
 # Providing component specific build options to cmake
 CMAKE_OPTIONS += -DBUILD_CONFIG=mysql_release
@@ -89,6 +87,9 @@
 CMAKE_OPTIONS += -DCMAKE_CXX_FLAGS=$(CMAKE_CXXFLAGS.$(BITS))
 CMAKE_OPTIONS += '-DCOMPILATION_COMMENT=MySQL Community Server (GPL)'
 CMAKE_OPTIONS += -DFEATURE_SET=community
+CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX)
+CMAKE_OPTIONS += -DCMAKE_C_COMPILER=$(CC)
+CMAKE_OPTIONS += -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
 
 COMPONENT_PRE_BUILD_ACTION += cd $(@D);
 COMPONENT_PRE_BUILD_ACTION += export LDFLAGS=$(CMAKE_CXXFLAGS.$(BITS));