diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-07-02 17:17:33 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-07-02 17:17:33 +1000 |
| commit | 95e9f3c186f75e2189e0c0416fc35e6244aedae2 (patch) | |
| tree | 5cf92205544028d5730099c7d9df21c6fe683473 /mysql-test | |
| parent | 6a3a0460133d0336d4774c006193b231daa6cc3b (diff) | |
| parent | 7ce5984d6df1bb4f843bec244411ec5514c46105 (diff) | |
| download | mariadb-git-95e9f3c186f75e2189e0c0416fc35e6244aedae2.tar.gz | |
Merge branch 10.3 into 10.4
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/funcs_1/r/is_tables_is.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/rebuild.result | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_tables_is.result b/mysql-test/suite/funcs_1/r/is_tables_is.result index e9ce9b91d08..597eb002841 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_is.result +++ b/mysql-test/suite/funcs_1/r/is_tables_is.result @@ -458,6 +458,8 @@ TABLE_COLLATION utf8_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# +MAX_INDEX_LENGTH #MIL# +TEMPORARY Y user_comment Separator ----------------------------------------------------- TABLE_CATALOG def @@ -831,6 +833,8 @@ TABLE_COLLATION utf8_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# +MAX_INDEX_LENGTH #MIL# +TEMPORARY Y user_comment Separator ----------------------------------------------------- TABLE_CATALOG def @@ -1570,6 +1574,8 @@ TABLE_COLLATION utf8_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# +MAX_INDEX_LENGTH #MIL# +TEMPORARY Y user_comment Separator ----------------------------------------------------- TABLE_CATALOG def @@ -1943,6 +1949,8 @@ TABLE_COLLATION utf8_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# +MAX_INDEX_LENGTH #MIL# +TEMPORARY Y user_comment Separator ----------------------------------------------------- TABLE_CATALOG def diff --git a/mysql-test/suite/sql_sequence/rebuild.result b/mysql-test/suite/sql_sequence/rebuild.result index e5407ef69f3..80ac6fa34f3 100644 --- a/mysql-test/suite/sql_sequence/rebuild.result +++ b/mysql-test/suite/sql_sequence/rebuild.result @@ -45,6 +45,7 @@ INNODB_SYS_INDEXES INNODB_SYS_TABLES INNODB_SYS_VIRTUAL INNODB_TRX +KEYWORDS KEY_CACHES KEY_COLUMN_USAGE OPTIMIZER_TRACE @@ -60,6 +61,7 @@ SCHEMA_PRIVILEGES SESSION_STATUS SESSION_VARIABLES SPATIAL_REF_SYS +SQL_FUNCTIONS STATISTICS SYSTEM_VARIABLES TABLES |