--- a/components/mysql-5-6/Makefile	Thu Apr 21 23:01:28 2016 -0700
+++ b/components/mysql-5-6/Makefile	Fri Apr 22 05:54:31 2016 -0700
@@ -27,17 +27,28 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME        = mysql
-COMPONENT_VERSION     = 5.6.25
+COMPONENT_VERSION     = 5.6.29
+COMPONENT_SRC         = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE     = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-         sha256:15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd
+         sha256:6ac85b75b2dfa8c232725dda25469df37bf4e48b408cc0978d0dfc34c25a817f
 COMPONENT_ARCHIVE_URL = http://cdn.mysql.com/Downloads/MySQL-5.6/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL = http://dev.mysql.com/ 
 COMPONENT_BUGDB       = database/mysql
 
+#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);
+
 BUILD_STYLE= justmake
 TEST_TARGET= $(NO_TESTS)
+SYSTEM_TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
+# Enable ASLR for this component
+ASLR_MODE           = $(ASLR_ENABLE)
+
 # MySQL being one of Oracle's own product doesn't require to have a
 # TPNO License number.
 
@@ -54,10 +65,10 @@
 CMAKE_LIBDIR.64     = lib/$(MACH64)
 CMAKE_PLUGINDIR.32  = lib/plugin
 CMAKE_PLUGINDIR.64  = lib/$(MACH64)/plugin
-CMAKE_CFLAGS.32     = -D__MATHERR_RENAME_EXCEPTION
-CMAKE_CFLAGS.64     = -m64 -D__MATHERR_RENAME_EXCEPTION
-CMAKE_CXXFLAGS.32   = -D__MATHERR_RENAME_EXCEPTION -template=extdef -xnorunpath
-CMAKE_CXXFLAGS.64   = -m64 -D__MATHERR_RENAME_EXCEPTION -template=extdef -xnorunpath
+CMAKE_CFLAGS.32     = -m32
+CMAKE_CFLAGS.64     = -m64
+CMAKE_CXXFLAGS.32   = -m32 -xnorunpath -std=c++03
+CMAKE_CXXFLAGS.64   = -m64 -xnorunpath -std=c++03
 
 # Providing component specific build options to cmake
 CMAKE_OPTIONS += -DBUILD_CONFIG=mysql_release
@@ -80,14 +91,14 @@
 CMAKE_OPTIONS += -DWITH_BLACKHOLE_STORAGE_ENGINE=1
 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 += -DWITH_INNOBASE_STORAGE_ENGINE=1
 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
-CMAKE_OPTIONS += -DSUNPRO_CXX_LIBRARY=stdcxx4
+CMAKE_OPTIONS += -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
 
 COMPONENT_PRE_BUILD_ACTION += cd $(@D);
 COMPONENT_PRE_BUILD_ACTION += export LDFLAGS=$(CMAKE_CXXFLAGS.$(BITS));
@@ -109,12 +120,12 @@
 	$(PROTO_DIR)/$(CMAKE_PREFIX)/bin/mysqlhotcopy
 
 REQUIRED_PACKAGES += database/mysql-56/client
-REQUIRED_PACKAGES += developer/build/cmake
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += $(PERL_PKG)
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/network
-REQUIRED_PACKAGES += library/c++/stdcxx