diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 6b63cd8d..1fca99e9 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -8,8 +8,12 @@ SET(MARIADB_CLIENT_INCLUDES ${CC_SOURCE_DIR}/include/mariadb_com.h
                             ${CC_SOURCE_DIR}/include/errmsg.h
                             ${CC_SOURCE_DIR}/include/mariadb_dyncol.h
                             ${CC_SOURCE_DIR}/include/mariadb_ctype.h
-                            ${CC_SOURCE_DIR}/include/mysqld_error.h
                             )
+IF(NOT IS_SUBPROJECT)
+  SET(MARIADB_CLIENT_INCLUDES ${MARIADB_CLIENT_INCLUDES}
+                              ${CC_SOURCE_DIR}/include/mysqld_error.h
+                              )
+ENDIF()
 SET(MYSQL_ADDITIONAL_INCLUDES
    ${CC_SOURCE_DIR}/include/mysql/client_plugin.h
    ${CC_SOURCE_DIR}/include/mysql/plugin_auth_common.h
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 0a533017..cc8c76d2 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -1,6 +1,6 @@
 /* Autogenerated file, please don't edit
    branch: 10.2
-   revision id: e180c35619c91c2256f2bb8c24b4f423c92acc7f
+   revision id: 01a4eb8f761eb669fe2ae5139c73a7434b141a8f
  */
 
 #define ER_ERROR_FIRST 1000
@@ -1102,4 +1102,25 @@
 #define ER_JSON_PATH_EMPTY 4051
 #define ER_SLAVE_SAME_ID 4052
 #define ER_FLASHBACK_NOT_SUPPORTED 4053
-#define ER_ERROR_LAST 4053
+#define ER_KEYS_OUT_OF_ORDER 4054
+#define ER_OVERLAPPING_KEYS 4055
+#define ER_REQUIRE_ROW_BINLOG_FORMAT 4056
+#define ER_ISOLATION_MODE_NOT_SUPPORTED 4057
+#define ER_ON_DUPLICATE_DISABLED 4058
+#define ER_UPDATES_WITH_CONSISTENT_SNAPSHOT 4059
+#define ER_ROLLBACK_ONLY 4060
+#define ER_ROLLBACK_TO_SAVEPOINT 4061
+#define ER_ISOLATION_LEVEL_WITH_CONSISTENT_SNAPSHOT 4062
+#define ER_UNSUPPORTED_COLLATION 4063
+#define ER_METADATA_INCONSISTENCY 4064
+#define ER_KEY_CREATE_DURING_ALTER 4065
+#define ER_SK_POPULATE_DURING_ALTER 4066
+#define ER_CF_DIFFERENT 4067
+#define ER_RDB_STATUS_GENERAL 4068
+#define ER_RDB_STATUS_MSG 4069
+#define ER_NET_OK_PACKET_TOO_LARGE 4070
+#define ER_RDB_TTL_UNSUPPORTED 4071
+#define ER_RDB_TTL_COL_FORMAT 4072
+#define ER_RDB_TTL_DURATION_FORMAT 4073
+#define ER_PER_INDEX_CF_DEPRECATED 4074
+#define ER_ERROR_LAST 4074