diff options
| author | Monty <monty@mariadb.org> | 2021-09-15 20:23:07 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2021-09-15 20:23:07 +0300 |
| commit | b4f24c745a42d69fca2d67ce827c30632ef4b5fc (patch) | |
| tree | d33f5e720f6beb4d544635c2e30db974508eff95 /mysql-test/main/mysql-metadata.result | |
| parent | f03fee06b0f4bdb1d754d987db3375cade02445e (diff) | |
| parent | 689b8d060ac890dcf1071b34a68234b30005e9a1 (diff) | |
| download | mariadb-git-b4f24c745a42d69fca2d67ce827c30632ef4b5fc.tar.gz | |
Merge branch '10.4' into 10.5
Fixed also an error in suite/perfschema/t/transaction_nested_events-master.opt
Diffstat (limited to 'mysql-test/main/mysql-metadata.result')
| -rw-r--r-- | mysql-test/main/mysql-metadata.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/main/mysql-metadata.result b/mysql-test/main/mysql-metadata.result index ce6c77ed7fa..51b3eb24f2b 100644 --- a/mysql-test/main/mysql-metadata.result +++ b/mysql-test/main/mysql-metadata.result @@ -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: `` |