database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source 
Fixed also an error in suite/perfschema/t/transaction_nested_events-master.opt
This commit is contained in:
Monty
2021-09-15 20:23:07 +03:00
parent f03fee06b0 689b8d060a
commit b4f24c745a
14 changed files with 137 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/main/mysql-metadata.result
View File

@ -13,6 +13,7 @@ SELECT * FROM t1
--------------
Field 1: `js0`
Org_field: `js0`
Catalog: `def`
Database: `test`
Table: `t1`
@ -25,6 +26,7 @@ Decimals: 0
Flags: BLOB BINARY
Field 2: `js1`
Org_field: `js1`
Catalog: `def`
Database: `test`
Table: `t1`
@ -37,6 +39,7 @@ Decimals: 0
Flags: BLOB
Field 3: `js2`
Org_field: `js2`
Catalog: `def`
Database: `test`
Table: `t1`
@ -49,6 +52,7 @@ Decimals: 0
Flags: BLOB
Field 4: `js3`
Org_field: `js3`
Catalog: `def`
Database: `test`
Table: `t1`
@ -69,6 +73,7 @@ SELECT JSON_COMPACT(js0) FROM t1
--------------
Field 1: `JSON_COMPACT(js0)`
Org_field: ``
Catalog: `def`
Database: ``
Table: ``