diff --git a/mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/keywords/MySqlKeyWordsHandler.java b/mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/keywords/MySqlKeyWordsHandler.java
index f45dc7287..7d44b209e 100644
--- a/mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/keywords/MySqlKeyWordsHandler.java
+++ b/mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/keywords/MySqlKeyWordsHandler.java
@@ -25,7 +25,7 @@
 
 /**
  * mysql关键字处理
- * 这里选取了mysql5.7文档中的关键字和保留字（含移除）https://dev.mysql.com/doc/refman/5.7/en/keywords.html
+ * 这里选取了mysql8.0文档中的关键字和保留字（含移除）https://dev.mysql.com/doc/refman/8.0/en/keywords.html
  *
  * @author nieqiurong 2020/5/7.
  * @since 3.3.2
@@ -36,7 +36,9 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "ACCESSIBLE",
         "ACCOUNT",
         "ACTION",
+        "ACTIVE",
         "ADD",
+        "ADMIN",
         "AFTER",
         "AGAINST",
         "AGGREGATE",
@@ -48,11 +50,14 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "ANALYZE",
         "AND",
         "ANY",
+        "ARRAY",
         "AS",
         "ASC",
         "ASCII",
         "ASENSITIVE",
         "AT",
+        "ATTRIBUTE",
+        "AUTHENTICATION",
         "AUTOEXTEND_SIZE",
         "AUTO_INCREMENT",
         "AVG",
@@ -71,6 +76,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "BOOLEAN",
         "BOTH",
         "BTREE",
+        "BUCKETS",
         "BY",
         "BYTE",
         "CACHE",
@@ -80,6 +86,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "CASE",
         "CATALOG_NAME",
         "CHAIN",
+        "CHALLENGE_RESPONSE",
         "CHANGE",
         "CHANGED",
         "CHANNEL",
@@ -91,6 +98,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "CIPHER",
         "CLASS_ORIGIN",
         "CLIENT",
+        "CLONE",
         "CLOSE",
         "COALESCE",
         "CODE",
@@ -105,6 +113,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "COMMITTED",
         "COMPACT",
         "COMPLETION",
+        "COMPONENT",
         "COMPRESSED",
         "COMPRESSION",
         "CONCURRENT",
@@ -123,6 +132,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "CREATE",
         "CROSS",
         "CUBE",
+        "CUME_DIST",
         "CURRENT",
         "CURRENT_DATE",
         "CURRENT_TIME",
@@ -148,11 +158,14 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "DEFAULT",
         "DEFAULT_AUTH",
         "DEFINER",
+        "DEFINITION",
         "DELAYED",
         "DELAY_KEY_WRITE",
         "DELETE",
+        "DENSE_RANK",
         "DESC",
         "DESCRIBE",
+        "DESCRIPTION",
         "DES_KEY_FILE",
         "DETERMINISTIC",
         "DIAGNOSTICS",
@@ -173,12 +186,15 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "EACH",
         "ELSE",
         "ELSEIF",
+        "EMPTY",
         "ENABLE",
         "ENCLOSED",
         "ENCRYPTION",
         "END",
         "ENDS",
+        "ENFORCED",
         "ENGINE",
+        "ENGINE_ATTRIBUTE",
         "ENGINES",
         "ENUM",
         "ERROR",
@@ -188,7 +204,9 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "EVENT",
         "EVENTS",
         "EVERY",
+        "EXCEPT",
         "EXCHANGE",
+        "EXCLUDE",
         "EXECUTE",
         "EXISTS",
         "EXIT",
@@ -198,6 +216,8 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "EXPORT",
         "EXTENDED",
         "EXTENT_SIZE",
+        "FACTOR",
+        "FAILED_LOGIN_ATTEMPTS",
         "FALSE",
         "FAST",
         "FAULTS",
@@ -206,12 +226,15 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "FILE",
         "FILE_BLOCK_SIZE",
         "FILTER",
+        "FINISH",
         "FIRST",
+        "FIRST_VALUE",
         "FIXED",
         "FLOAT",
         "FLOAT4",
         "FLOAT8",
         "FLUSH",
+        "FOLLOWING",
         "FOLLOWS",
         "FOR",
         "FORCE",
@@ -224,20 +247,28 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "FUNCTION",
         "GENERAL",
         "GENERATED",
+        "GEOMCOLLECTION",
         "GEOMETRY",
         "GEOMETRYCOLLECTION",
         "GET",
         "GET_FORMAT",
+        "GET_MASTER_PUBLIC_KEY",
+        "GET_SOURCE_PUBLIC_KEY",
         "GLOBAL",
         "GRANT",
         "GRANTS",
         "GROUP",
         "GROUP_REPLICATION",
+        "GROUPING",
+        "GROUPS",
+        "GTID_ONLY",
         "HANDLER",
         "HASH",
         "HAVING",
         "HELP",
         "HIGH_PRIORITY",
+        "HISTOGRAM",
+        "HISTORY",
         "HOST",
         "HOSTS",
         "HOUR",
@@ -250,10 +281,13 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "IGNORE_SERVER_IDS",
         "IMPORT",
         "IN",
+        "INACTIVE",
         "INDEX",
         "INDEXES",
         "INFILE",
+        "INITIAL",
         "INITIAL_SIZE",
+        "INITIATE",
         "INNER",
         "INOUT",
         "INSENSITIVE",
@@ -270,6 +304,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "INTEGER",
         "INTERVAL",
         "INTO",
+        "INVISIBLE",
         "INVOKER",
         "IO",
         "IO_AFTER_GTIDS",
@@ -282,12 +317,19 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "ITERATE",
         "JOIN",
         "JSON",
+        "JSON_TABLE",
+        "JSON_VALUE",
         "KEY",
         "KEYS",
         "KEY_BLOCK_SIZE",
+        "KEYRING",
         "KILL",
+        "LAG",
         "LANGUAGE",
         "LAST",
+        "LAST_VALUE",
+        "LATERAL",
+        "LEAD",
         "LEADING",
         "LEAVE",
         "LEAVES",
@@ -305,6 +347,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "LOCALTIME",
         "LOCALTIMESTAMP",
         "LOCK",
+        "LOCKED",
         "LOCKS",
         "LOGFILE",
         "LOGS",
@@ -316,6 +359,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "MASTER",
         "MASTER_AUTO_POSITION",
         "MASTER_BIND",
+        "MASTER_COMPRESSION_ALGORITHMS",
         "MASTER_CONNECT_RETRY",
         "MASTER_DELAY",
         "MASTER_HEARTBEAT_PERIOD",
@@ -324,6 +368,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "MASTER_LOG_POS",
         "MASTER_PASSWORD",
         "MASTER_PORT",
+        "MASTER_PUBLIC_KEY_PATH",
         "MASTER_RETRY_COUNT",
         "MASTER_SERVER_ID",
         "MASTER_SSL",
@@ -335,8 +380,10 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "MASTER_SSL_CRLPATH",
         "MASTER_SSL_KEY",
         "MASTER_SSL_VERIFY_SERVER_CERT",
+        "MASTER_TLS_CIPHERSUITES",
         "MASTER_TLS_VERSION",
         "MASTER_USER",
+        "MASTER_ZSTD_COMPRESSION_LEVEL",
         "MATCH",
         "MAXVALUE",
         "MAX_CONNECTIONS_PER_HOUR",
@@ -350,6 +397,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "MEDIUMBLOB",
         "MEDIUMINT",
         "MEDIUMTEXT",
+        "MEMBER",
         "MEMORY",
         "MERGE",
         "MESSAGE_TEXT",
@@ -377,6 +425,8 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "NCHAR",
         "NDB",
         "NDBCLUSTER",
+        "NESTED",
+        "NETWORK_NAMESPACE",
         "NEVER",
         "NEW",
         "NEXT",
@@ -385,13 +435,21 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "NONBLOCKING",
         "NONE",
         "NOT",
+        "NOWAIT",
         "NO_WAIT",
         "NO_WRITE_TO_BINLOG",
+        "NTH_VALUE",
+        "NTILE",
         "NULL",
+        "NULLS",
         "NUMBER",
         "NUMERIC",
         "NVARCHAR",
+        "OF",
+        "OFF",
         "OFFSET",
+        "OJ",
+        "OLD",
         "OLD_PASSWORD",
         "ON",
         "ONE",
@@ -400,13 +458,18 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "OPTIMIZE",
         "OPTIMIZER_COSTS",
         "OPTION",
+        "OPTIONAL",
         "OPTIONALLY",
         "OPTIONS",
         "OR",
         "ORDER",
+        "ORDINALITY",
+        "ORGANIZATION",
+        "OTHERS",
         "OUT",
         "OUTER",
         "OUTFILE",
+        "OVER",
         "OWNER",
         "PACK_KEYS",
         "PAGE",
@@ -417,6 +480,11 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "PARTITIONING",
         "PARTITIONS",
         "PASSWORD",
+        "PASSWORD_LOCK_TIME",
+        "PATH",
+        "PERCENT_RANK",
+        "PERSIST",
+        "PERSIST_ONLY",
         "PHASE",
         "PLUGIN",
         "PLUGINS",
@@ -425,13 +493,16 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "POLYGON",
         "PORT",
         "PRECEDES",
+        "PRECEDING",
         "PRECISION",
         "PREPARE",
         "PRESERVE",
         "PREV",
         "PRIMARY",
+        "PRIVILEGE_CHECKS_USER",
         "PRIVILEGES",
         "PROCEDURE",
+        "PROCESS",
         "PROCESSLIST",
         "PROFILE",
         "PROFILES",
@@ -440,7 +511,9 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "QUARTER",
         "QUERY",
         "QUICK",
+        "RANDOM",
         "RANGE",
+        "RANK",
         "READ",
         "READS",
         "READ_ONLY",
@@ -448,11 +521,14 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "REAL",
         "REBUILD",
         "RECOVER",
+        "RECURSIVE",
         "REDOFILE",
         "REDO_BUFFER_SIZE",
         "REDUNDANT",
+        "REFERENCE",
         "REFERENCES",
         "REGEXP",
+        "REGISTRATION",
         "RELAY",
         "RELAYLOG",
         "RELAY_LOG_FILE",
@@ -467,6 +543,8 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "REPEAT",
         "REPEATABLE",
         "REPLACE",
+        "REPLICA",
+        "REPLICAS",
         "REPLICATE_DO_DB",
         "REPLICATE_DO_TABLE",
         "REPLICATE_IGNORE_DB",
@@ -476,18 +554,26 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "REPLICATE_WILD_IGNORE_TABLE",
         "REPLICATION",
         "REQUIRE",
+        "REQUIRE_ROW_FORMAT",
         "RESET",
         "RESIGNAL",
+        "RESOURCE",
+        "RESPECT",
+        "RESTART",
         "RESTORE",
         "RESTRICT",
         "RESUME",
+        "RETAIN",
         "RETURN",
         "RETURNED_SQLSTATE",
+        "RETURNING",
         "RETURNS",
+        "REUSE",
         "REVERSE",
         "REVOKE",
         "RIGHT",
         "RLIKE",
+        "ROLE",
         "ROLLBACK",
         "ROLLUP",
         "ROTATE",
@@ -496,6 +582,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "ROWS",
         "ROW_COUNT",
         "ROW_FORMAT",
+        "ROW_NUMBER",
         "RTREE",
         "SAVEPOINT",
         "SCHEDULE",
@@ -504,6 +591,11 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "SCHEMA_NAME",
         "SECOND",
         "SECOND_MICROSECOND",
+        "SECONDARY",
+        "SECONDARY_ENGINE",
+        "SECONDARY_ENGINE_ATTRIBUTE",
+        "SECONDARY_LOAD",
+        "SECONDARY_UNLOAD",
         "SECURITY",
         "SELECT",
         "SENSITIVE",
@@ -519,6 +611,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "SIGNAL",
         "SIGNED",
         "SIMPLE",
+        "SKIP",
         "SLAVE",
         "SLOW",
         "SMALLINT",
@@ -528,12 +621,39 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "SONAME",
         "SOUNDS",
         "SOURCE",
+        "SOURCE_AUTO_POSITION",
+        "SOURCE_BIND",
+        "SOURCE_COMPRESSION_ALGORITHMS",
+        "SOURCE_CONNECT_RETRY",
+        "SOURCE_DELAY",
+        "SOURCE_HEARTBEAT_PERIOD",
+        "SOURCE_HOST",
+        "SOURCE_LOG_FILE",
+        "SOURCE_LOG_POS",
+        "SOURCE_PASSWORD",
+        "SOURCE_PORT",
+        "SOURCE_PUBLIC_KEY_PATH",
+        "SOURCE_RETRY_COUNT",
+        "SOURCE_SSL",
+        "SOURCE_SSL_CA",
+        "SOURCE_SSL_CAPATH",
+        "SOURCE_SSL_CERT",
+        "SOURCE_SSL_CIPHER",
+        "SOURCE_SSL_CRL",
+        "SOURCE_SSL_CRLPATH",
+        "SOURCE_SSL_KEY",
+        "SOURCE_SSL_VERIFY_SERVER_CERT",
+        "SOURCE_TLS_CIPHERSUITES",
+        "SOURCE_TLS_VERSION",
+        "SOURCE_USER",
+        "SOURCE_ZSTD_COMPRESSION_LEVEL",
         "SPATIAL",
         "SPECIFIC",
         "SQL",
         "SQLEXCEPTION",
         "SQLSTATE",
         "SQLWARNING",
+        "SRID",
         "SQL_AFTER_GTIDS",
         "SQL_AFTER_MTS_GAPS",
         "SQL_BEFORE_GTIDS",
@@ -565,6 +685,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "STORAGE",
         "STORED",
         "STRAIGHT_JOIN",
+        "STREAM",
         "STRING",
         "SUBCLASS_ORIGIN",
         "SUBJECT",
@@ -574,6 +695,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "SUSPEND",
         "SWAPS",
         "SWITCHES",
+        "SYSTEM",
         "TABLE",
         "TABLES",
         "TABLESPACE",
@@ -585,6 +707,8 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "TEXT",
         "THAN",
         "THEN",
+        "THREAD_PRIORITY",
+        "TIES",
         "TIME",
         "TIMESTAMP",
         "TIMESTAMPADD",
@@ -592,6 +716,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "TINYBLOB",
         "TINYINT",
         "TINYTEXT",
+        "TLS",
         "TO",
         "TRAILING",
         "TRANSACTION",
@@ -601,6 +726,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "TRUNCATE",
         "TYPE",
         "TYPES",
+        "UNBOUNDED",
         "UNCOMMITTED",
         "UNDEFINED",
         "UNDO",
@@ -612,6 +738,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "UNIQUE",
         "UNKNOWN",
         "UNLOCK",
+        "UNREGISTER",
         "UNSIGNED",
         "UNTIL",
         "UPDATE",
@@ -633,8 +760,10 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "VARCHARACTER",
         "VARIABLES",
         "VARYING",
+        "VCPU",
         "VIEW",
         "VIRTUAL",
+        "VISIBLE",
         "WAIT",
         "WARNINGS",
         "WEEK",
@@ -642,6 +771,7 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "WHEN",
         "WHERE",
         "WHILE",
+        "WINDOW",
         "WITH",
         "WITHOUT",
         "WORK",
@@ -654,7 +784,8 @@ public class MySqlKeyWordsHandler extends BaseKeyWordsHandler {
         "XOR",
         "YEAR",
         "YEAR_MONTH",
-        "ZEROFILL"));
+        "ZEROFILL",
+        "ZONE"));
 
     public MySqlKeyWordsHandler() {
         super(new HashSet<>(KEY_WORDS));