diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java
index aef362cbc9..9a599f7701 100644
--- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java
@@ -41,14 +41,12 @@ public class MySqlCreateFunctionTest_1 extends MysqlTest {
 
         System.out.println(SQLUtils.toMySqlString(stmt));
 
-        assertEquals("CREATE PROCEDURE `load_part_tab` ()\n" +
+        assertEquals("CREATE FUNCTION `test1`.`proc1` (\n" +
+                "\t`a` enum('1', '2') CHARACTER SET utf8\n" +
+                ")\n" +
+                "RETURNS int(10) DETERMINISTIC\n" +
                 "BEGIN\n" +
-                "\tDECLARE v INT DEFAULT 0;\n" +
-                "\tWHILE v < 1 DO\n" +
-                "\tINSERT INTO part_tab\n" +
-                "\tVALUES (v, 'testing partitions', ADDDATE('1995-01-01', RAND(v) * 36520 % 3652));\n" +
-                "\tSET v = v + 1;\n" +
-                "\tEND WHILE;\n" +
+                "\tRETURN 0;\n" +
                 "END", SQLUtils.toMySqlString(stmt));
 
         SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL);
@@ -59,11 +57,10 @@ public class MySqlCreateFunctionTest_1 extends MysqlTest {
 //        System.out.println("coditions : " + visitor.getConditions());
 //        System.out.println("orderBy : " + visitor.getOrderByColumns());
         
-        assertEquals(1, visitor.getTables().size());
+        assertEquals(0, visitor.getTables().size());
         assertEquals(0, visitor.getColumns().size());
         assertEquals(0, visitor.getConditions().size());
 
-        assertTrue(visitor.containsTable("part_tab"));
     }
 
     
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java
index 28dfc786e4..ee44f8c288 100644
--- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java
+++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java
@@ -28,18 +28,18 @@ public class MySqlCreateTableTest150_eunm_set_with_charset extends TestCase {
         assertEquals(1, statementList.size());
 
         assertEquals("CREATE TEMPORARY TABLE `tb_xx` (\n" +
-                "\t`col_ttuap` enum('value1', 'value2') GENERATED ALWAYS AS (1 + 2) VIRTUAL CHARACTER SET utf8 COLLATE utf8_unicode_ci UNIQUE COMMENT 'comment' REFERENCES tb_fn (`col_qzqnqrrfyv`) MATCH PARTIAL\n" +
+                "\t`col_ttuap` enum('value1', 'value2') CHARACTER SET utf8 COLLATE utf8_unicode_ci GENERATED ALWAYS AS (1 + 2) VIRTUAL UNIQUE COMMENT 'comment' REFERENCES tb_fn (`col_qzqnqrrfyv`) MATCH PARTIAL\n" +
                 ") MIN_ROWS = 1 CHECKSUM = 1 COMPRESSION = 'NONE'", stmt.toString());
 
         assertEquals("create temporary table `tb_xx` (\n" +
-                "\t`col_ttuap` enum('value1', 'value2') generated always as (1 + 2) virtual character set utf8 collate utf8_unicode_ci unique comment 'comment' references tb_fn (`col_qzqnqrrfyv`) match partial\n" +
+                "\t`col_ttuap` enum('value1', 'value2') character set utf8 collate utf8_unicode_ci generated always as (1 + 2) virtual unique comment 'comment' references tb_fn (`col_qzqnqrrfyv`) match partial\n" +
                 ") min_rows = 1 checksum = 1 compression = 'NONE'", stmt.toLowerCaseString());
     }
 
     public void test_1() {
         String sql = "create temporary table `tb_xx` (\n" +
-                "`col_ttuap` set('value1','value2') character set utf8  collate utf8_unicode_ci generated always as ( 1+2 ) virtual unique comment 'comment' references tb_fn ( `col_qzqnqrrfyv` ) match partial\n" +
-                ") min_rows = 1 , checksum = 1 , compression 'NONE'";
+                "\t`col_ttuap` enum('value1', 'value2') character set utf8 collate utf8_unicode_ci generated always as (1 + 2) virtual unique comment 'comment' references tb_fn (`col_qzqnqrrfyv`) match partial\n" +
+                ") min_rows = 1 checksum = 1 compression = 'NONE'";
 
         MySqlStatementParser parser = new MySqlStatementParser(sql);
         List<SQLStatement> statementList = parser.parseStatementList();
@@ -48,11 +48,11 @@ public class MySqlCreateTableTest150_eunm_set_with_charset extends TestCase {
         assertEquals(1, statementList.size());
 
         assertEquals("CREATE TEMPORARY TABLE `tb_xx` (\n" +
-                "\t`col_ttuap` set('value1', 'value2') GENERATED ALWAYS AS (1 + 2) VIRTUAL CHARACTER SET utf8 COLLATE utf8_unicode_ci UNIQUE COMMENT 'comment' REFERENCES tb_fn (`col_qzqnqrrfyv`) MATCH PARTIAL\n" +
+                "\t`col_ttuap` enum('value1', 'value2') CHARACTER SET utf8 COLLATE utf8_unicode_ci GENERATED ALWAYS AS (1 + 2) VIRTUAL UNIQUE COMMENT 'comment' REFERENCES tb_fn (`col_qzqnqrrfyv`) MATCH PARTIAL\n" +
                 ") MIN_ROWS = 1 CHECKSUM = 1 COMPRESSION = 'NONE'", stmt.toString());
 
         assertEquals("create temporary table `tb_xx` (\n" +
-                "\t`col_ttuap` set('value1', 'value2') generated always as (1 + 2) virtual character set utf8 collate utf8_unicode_ci unique comment 'comment' references tb_fn (`col_qzqnqrrfyv`) match partial\n" +
+                "\t`col_ttuap` enum('value1', 'value2') character set utf8 collate utf8_unicode_ci generated always as (1 + 2) virtual unique comment 'comment' references tb_fn (`col_qzqnqrrfyv`) match partial\n" +
                 ") min_rows = 1 checksum = 1 compression = 'NONE'", stmt.toLowerCaseString());
     }