database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-12-23 19:28:02 +01:00
parent fa1aef39eb 8d8370e31d
commit 25561435e0
115 changed files with 1936 additions and 1234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/funcs_1/r/is_tables_is_embedded.result
View File

@ -91,9 +91,9 @@ TABLE_CATALOG def
TABLE_SCHEMA information_schema
TABLE_NAME CHECK_CONSTRAINTS
TABLE_TYPE SYSTEM VIEW
ENGINE MEMORY
ENGINE MYISAM_OR_MARIA
VERSION 11
ROW_FORMAT Fixed
ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL#
@ -1132,9 +1132,9 @@ TABLE_CATALOG def
TABLE_SCHEMA information_schema
TABLE_NAME CHECK_CONSTRAINTS
TABLE_TYPE SYSTEM VIEW
ENGINE MEMORY
ENGINE MYISAM_OR_MARIA
VERSION 11
ROW_FORMAT Fixed
ROW_FORMAT DYNAMIC_OR_PAGE
TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL#