diff --git a/tools/contexts/_functionsMySql80400.txt b/tools/contexts/_functionsMySql80400.txt
index cf12b595..c5bc51a5 100644
--- a/tools/contexts/_functionsMySql80400.txt
+++ b/tools/contexts/_functionsMySql80400.txt
@@ -5,30 +5,32 @@ ADDTIME (F)
 AES_DECRYPT (F)
 AES_ENCRYPT (F)
 ANY_VALUE (F)
-Area (F)
-AsBinary (F)
 ASCII (F)
 ASIN (F)
-AsText (F)
-AsWKB (F)
-AsWKT (F)
+asynchronous_connection_failover_add_managed (F)
+asynchronous_connection_failover_add_source (F)
+asynchronous_connection_failover_delete_managed (F)
+asynchronous_connection_failover_delete_source (F)
+asynchronous_connection_failover_reset (F)
 ATAN (F)
 ATAN2 (F)
 AVG (F)
 BENCHMARK (F)
 BIN (F)
-BINARY (F)
 BIN_TO_UUID (F)
 BIT_AND (F)
 BIT_COUNT (F)
 BIT_LENGTH (F)
 BIT_OR (F)
 BIT_XOR (F)
-Buffer (F)
+CAN_ACCESS_COLUMN (F)
+CAN_ACCESS_DATABASE (F)
+CAN_ACCESS_TABLE (F)
+CAN_ACCESS_USER (F)
+CAN_ACCESS_VIEW (F)
 CAST (F)
 CEIL (F)
 CEILING (F)
-Centroid (F)
 CHAR (F)
 CHAR_LENGTH (F)
 CHARACTER_LENGTH (F)
@@ -40,18 +42,17 @@ COMPRESS (F)
 CONCAT (F)
 CONCAT_WS (F)
 CONNECTION_ID (F)
-Contains (F)
 CONV (F)
 CONVERT (F)
 CONVERT_TZ (F)
-ConvexHull (F)
 COS (F)
 COT (F)
 COUNT (F)
 CRC32 (F)
-Crosses (F)
+CUME_DIST (F)
 CURDATE (F)
 CURRENT_DATE (F)
+CURRENT_ROLE (F)
 CURRENT_TIME (F)
 CURRENT_TIMESTAMP (F)
 CURRENT_USER (F)
@@ -67,78 +68,83 @@ DAYNAME (F)
 DAYOFMONTH (F)
 DAYOFWEEK (F)
 DAYOFYEAR (F)
-DECODE (F)
 DEFAULT (F)
 DEGREES (F)
-DES_DECRYPT (F)
-DES_ENCRYPT (F)
-Dimension (F)
-Disjoint (F)
-Distance (F)
+DENSE_RANK (F)
 ELT (F)
-ENCODE (F)
-ENCRYPT (F)
-EndPoint (F)
-Envelope (F)
-Equals (F)
 EXP (F)
 EXPORT_SET (F)
-ExteriorRing (F)
 EXTRACT (F)
 ExtractValue (F)
 FIELD (F)
 FIND_IN_SET (F)
+FIRST_VALUE (F)
 FLOOR (F)
 FORMAT (F)
+FORMAT_BYTES (F)
+FORMAT_PICO_TIME (F)
 FOUND_ROWS (F)
-FROM_BASE64 (F)
 FROM_DAYS (F)
 FROM_UNIXTIME (F)
-GeomCollFromText (F)
-GeomCollFromWKB (F)
+GeomCollection (F)
 GeometryCollection (F)
-GeometryCollectionFromText (F)
-GeometryCollectionFromWKB (F)
-GeometryFromText (F)
-GeometryN (F)
-GeometryType (F)
-GeomFromText (F)
-GeomFromWKB (F)
+GET_DD_COLUMN_PRIVILEGES (F)
+GET_DD_CREATE_OPTIONS (F)
+GET_DD_INDEX_SUB_PART_LENGTH (F)
 GET_FORMAT (F)
 GET_LOCK (F)
-GLength (F)
 GREATEST (F)
 GROUP_CONCAT (F)
-GTID_SUBSET (F)
-GTID_SUBTRACT (F)
+GROUPING (F)
+group_replication_disable_member_action (F)
+group_replication_enable_member_action (F)
+group_replication_get_communication_protocol (F)
+group_replication_get_write_concurrency (F)
+group_replication_reset_member_actions (F)
+group_replication_set_as_primary (F)
+group_replication_set_communication_protocol (F)
+group_replication_set_write_concurrency (F)
+group_replication_switch_to_multi_primary_mode (F)
+group_replication_switch_to_single_primary_mode (F)
 HEX (F)
 HOUR (F)
+ICU_VERSION (F)
 IF (F)
 IFNULL (F)
 IN (F)
-INET6_ATON (F)
-INET6_NTOA (F)
 INET_ATON (F)
 INET_NTOA (F)
 INSERT (F)
 INSTR (F)
-InteriorRingN (F)
-Intersects (F)
+INTERNAL_AUTO_INCREMENT (F)
+INTERNAL_AVG_ROW_LENGTH (F)
+INTERNAL_CHECK_TIME (F)
+INTERNAL_CHECKSUM (F)
+INTERNAL_DATA_FREE (F)
+INTERNAL_DATA_LENGTH (F)
+INTERNAL_DD_CHAR_LENGTH (F)
+INTERNAL_GET_COMMENT_OR_ERROR (F)
+INTERNAL_GET_ENABLED_ROLE_JSON (F)
+INTERNAL_GET_HOSTNAME (F)
+INTERNAL_GET_USERNAME (F)
+INTERNAL_GET_VIEW_WARNING_OR_ERROR (F)
+INTERNAL_INDEX_COLUMN_CARDINALITY (F)
+INTERNAL_INDEX_LENGTH (F)
+INTERNAL_IS_ENABLED_ROLE (F)
+INTERNAL_IS_MANDATORY_ROLE (F)
+INTERNAL_KEYS_DISABLED (F)
+INTERNAL_MAX_DATA_LENGTH (F)
+INTERNAL_TABLE_ROWS (F)
+INTERNAL_UPDATE_TIME (F)
 INTERVAL (F)
 IS_FREE_LOCK (F)
-IS_IPV4 (F)
-IS_IPV4_COMPAT (F)
-IS_IPV4_MAPPED (F)
-IS_IPV6 (F)
 IS_USED_LOCK (F)
 IS_UUID (F)
-IsClosed (F)
-IsEmpty (F)
 ISNULL (F)
-IsSimple (F)
 JSON_ARRAY (F)
 JSON_ARRAY_APPEND (F)
 JSON_ARRAY_INSERT (F)
+JSON_ARRAYAGG (F)
 JSON_CONTAINS (F)
 JSON_CONTAINS_PATH (F)
 JSON_DEPTH (F)
@@ -150,26 +156,33 @@ JSON_MERGE (F)
 JSON_MERGE_PATCH (F)
 JSON_MERGE_PRESERVE (F)
 JSON_OBJECT (F)
+JSON_OBJECTAGG (F)
+JSON_OVERLAPS (F)
 JSON_PRETTY (F)
 JSON_QUOTE (F)
 JSON_REMOVE (F)
 JSON_REPLACE (F)
+JSON_SCHEMA_VALID (F)
+JSON_SCHEMA_VALIDATION_REPORT (F)
 JSON_SEARCH (F)
 JSON_SET (F)
 JSON_STORAGE_FREE (F)
 JSON_STORAGE_SIZE (F)
+JSON_TABLE (F)
 JSON_TYPE (F)
 JSON_UNQUOTE (F)
 JSON_VALID (F)
+JSON_VALUE (F)
+LAG (F)
+LAST_DAY (F)
 LAST_INSERT_ID (F)
+LAST_VALUE (F)
 LCASE (F)
+LEAD (F)
 LEAST (F)
 LEFT (F)
 LENGTH (F)
-LineFromText (F)
-LineFromWKB (F)
 LineString (F)
-LineStringFromWKB (F)
 LN (F)
 LOAD_FILE (F)
 LOCALTIME (F)
@@ -185,81 +198,69 @@ MAKE_SET (F)
 MAKEDATE (F)
 MAKETIME (F)
 MASTER_POS_WAIT (F)
+MATCH (F)
 MAX (F)
 MBRContains (F)
 MBRCoveredBy (F)
 MBRCovers (F)
 MBRDisjoint (F)
-MBREqual (F)
 MBREquals (F)
 MBRIntersects (F)
 MBROverlaps (F)
 MBRTouches (F)
 MBRWithin (F)
 MD5 (F)
+MEMBER OF (F)
 MICROSECOND (F)
 MID (F)
 MIN (F)
 MINUTE (F)
-MLineFromText (F)
-MLineFromWKB (F)
 MOD (F)
 MONTH (F)
 MONTHNAME (F)
-MPointFromText (F)
-MPointFromWKB (F)
-MPolyFromText (F)
-MPolyFromWKB (F)
 MultiLineString (F)
-MultiLineStringFromText (F)
-MultiLineStringFromWKB (F)
 MultiPoint (F)
-MultiPointFromText (F)
-MultiPointFromWKB (F)
 MultiPolygon (F)
-MultiPolygonFromText (F)
-MultiPolygonFromWKB (F)
 NAME_CONST (F)
 NOT IN (F)
 NOW (F)
+NTH_VALUE (F)
+NTILE (F)
 NULLIF (F)
-NumGeometries (F)
-NumInteriorRings (F)
-NumPoints (F)
 OCT (F)
 OCTET_LENGTH (F)
-OLD_PASSWORD (F)
 ORD (F)
-Overlaps (F)
-PASSWORD (F)
+PERCENT_RANK (F)
 PERIOD_ADD (F)
 PERIOD_DIFF (F)
 PI (F)
 Point (F)
-PointFromText (F)
-PointFromWKB (F)
-PointN (F)
-PolyFromText (F)
-PolyFromWKB (F)
 Polygon (F)
-PolygonFromText (F)
-PolygonFromWKB (F)
 POSITION (F)
 POW (F)
 POWER (F)
+PS_CURRENT_THREAD_ID (F)
+PS_THREAD_ID (F)
 QUARTER (F)
 QUOTE (F)
 RADIANS (F)
 RAND (F)
 RANDOM_BYTES (F)
+RANK (F)
+REGEXP_INSTR (F)
+REGEXP_LIKE (F)
+REGEXP_REPLACE (F)
+REGEXP_SUBSTR (F)
 RELEASE_ALL_LOCKS (F)
 RELEASE_LOCK (F)
 REPEAT (F)
 REPLACE (F)
 REVERSE (F)
 RIGHT (F)
+ROLES_GRAPHML (F)
 ROUND (F)
 ROW_COUNT (F)
+ROW_NUMBER (F)
 RPAD (F)
 RTRIM (F)
 SCHEMA (F)
@@ -273,9 +274,9 @@ SIGN (F)
 SIN (F)
 SLEEP (F)
 SOUNDEX (F)
+SOURCE_POS_WAIT (F)
 SPACE (F)
 SQRT (F)
-SRID (F)
 ST_Area (F)
 ST_AsBinary (F)
 ST_AsGeoJSON (F)
@@ -285,6 +286,7 @@ ST_AsWKT (F)
 ST_Buffer (F)
 ST_Buffer_Strategy (F)
 ST_Centroid (F)
+ST_Collect (F)
 ST_Contains (F)
 ST_ConvexHull (F)
 ST_Crosses (F)
@@ -297,6 +299,7 @@ ST_EndPoint (F)
 ST_Envelope (F)
 ST_Equals (F)
 ST_ExteriorRing (F)
+ST_FrechetDistance (F)
 ST_GeoHash (F)
 ST_GeomCollFromText (F)
 ST_GeomCollFromTxt (F)
@@ -304,11 +307,13 @@ ST_GeomCollFromWKB (F)
 ST_GeometryCollectionFromText (F)
 ST_GeometryCollectionFromWKB (F)
 ST_GeometryFromText (F)
+ST_GeometryFromWKB (F)
 ST_GeometryN (F)
 ST_GeometryType (F)
 ST_GeomFromGeoJSON (F)
 ST_GeomFromText (F)
 ST_GeomFromWKB (F)
+ST_HausdorffDistance (F)
 ST_InteriorRingN (F)
 ST_Intersection (F)
 ST_Intersects (F)
@@ -317,11 +322,16 @@ ST_IsEmpty (F)
 ST_IsSimple (F)
 ST_IsValid (F)
 ST_LatFromGeoHash (F)
+ST_Latitude (F)
 ST_Length (F)
 ST_LineFromText (F)
 ST_LineFromWKB (F)
+ST_LineInterpolatePoint (F)
+ST_LineInterpolatePoints (F)
+ST_LineStringFromText (F)
 ST_LineStringFromWKB (F)
 ST_LongFromGeoHash (F)
+ST_Longitude (F)
 ST_MakeEnvelope (F)
 ST_MLineFromText (F)
 ST_MLineFromWKB (F)
@@ -336,9 +346,11 @@ ST_MultiPointFromWKB (F)
 ST_MultiPolygonFromText (F)
 ST_MultiPolygonFromWKB (F)
 ST_NumGeometries (F)
+ST_NumInteriorRing (F)
 ST_NumInteriorRings (F)
 ST_NumPoints (F)
 ST_Overlaps (F)
+ST_PointAtDistance (F)
 ST_PointFromGeoHash (F)
 ST_PointFromText (F)
 ST_PointFromWKB (F)
@@ -350,14 +362,17 @@ ST_PolygonFromWKB (F)
 ST_Simplify (F)
 ST_SRID (F)
 ST_StartPoint (F)
+ST_SwapXY (F)
 ST_SymDifference (F)
 ST_Touches (F)
+ST_Transform (F)
 ST_Union (F)
 ST_Validate (F)
 ST_Within (F)
 ST_X (F)
 ST_Y (F)
-StartPoint (F)
+STATEMENT_DIGEST (F)
+STATEMENT_DIGEST_TEXT (F)
 STD (F)
 STDDEV (F)
 STDDEV_POP (F)
@@ -380,10 +395,8 @@ TIMEDIFF (F)
 TIMESTAMP (F)
 TIMESTAMPADD (F)
 TIMESTAMPDIFF (F)
-TO_BASE64 (F)
 TO_DAYS (F)
 TO_SECONDS (F)
-Touches (F)
 TRIM (F)
 TRUNCATE (F)
 UCASE (F)
@@ -407,13 +420,9 @@ VAR_SAMP (F)
 VARIANCE (F)
 VERSION (F)
 WAIT_FOR_EXECUTED_GTID_SET (F)
-WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS (F)
 WEEK (F)
 WEEKDAY (F)
 WEEKOFYEAR (F)
 WEIGHT_STRING (F)
-Within (F)
-X (F)
-Y (F)
 YEAR (F)
 YEARWEEK (F)