diff --git a/packages/databases/mysql/package.mk b/packages/databases/mysql/package.mk
index 11994c365b..b467cc03b9 100644
--- a/packages/databases/mysql/package.mk
+++ b/packages/databases/mysql/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mysql"
-PKG_VERSION="5.7.17"
+PKG_VERSION="5.7.18"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mysql.com"
diff --git a/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch b/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch
index e1514dbf94..e42f7b8f02 100644
--- a/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch
+++ b/packages/databases/mysql/patches/mysql-0004-compile-comp_sql-even-when-crosscompiling.patch
@@ -1,7 +1,8 @@
-diff -Naur a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
---- a/scripts/CMakeLists.txt	2016-09-21 23:16:59.461308398 -0700
-+++ b/scripts/CMakeLists.txt	2016-09-21 23:23:50.606510539 -0700
-@@ -14,11 +14,8 @@
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 1d0480b..425abb8 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -14,10 +14,8 @@
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  
  # Build comp_sql - used for embedding SQL in C or C++ programs
@@ -9,9 +10,8 @@ diff -Naur a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
 - ADD_EXECUTABLE(comp_sql comp_sql.c)
 - TARGET_LINK_LIBRARIES(comp_sql)
 -ENDIF()
--
 +ADD_EXECUTABLE(comp_sql comp_sql.c)
 +TARGET_LINK_LIBRARIES(comp_sql)
  
- # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts)
- IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
+ # Add compiler information, for easier debugging of output from mysql_config.
+ SET(COMPILER_ID_AND_VERSION