diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-03-10 16:05:42 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-03-10 20:43:32 +0400 |
| commit | e40858a7bdc65be4386a9e74262731fae964958b (patch) | |
| tree | 184b48fea049e6e7ca4763480e6d6a7bd1ff9abd /plugin/type_inet/mysql-test/type_inet | |
| parent | 00749980acf617fbc26b5cdaff6e256a673dab76 (diff) | |
| download | mariadb-git-e40858a7bdc65be4386a9e74262731fae964958b.tar.gz | |
MDEV-17832 Protocol: extensions for Pluggable types and JSON, GEOMETRY
Diffstat (limited to 'plugin/type_inet/mysql-test/type_inet')
3 files changed, 28 insertions, 4 deletions
diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6.result b/plugin/type_inet/mysql-test/type_inet/type_inet6.result index 3dbbbccb100..15c8dbf8ca9 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6.result @@ -40,12 +40,12 @@ CREATE TABLE t1 (a INET6); INSERT INTO t1 VALUES ('::1'); SELECT * FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 a a 254 39 3 Y 160 0 8 +def test t1 t1 a a 254 (type=inet6) 39 3 Y 160 0 8 a ::1 SELECT CAST('::' AS INET6) AS a; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def a 254 39 2 N 33 0 8 +def a 254 (type=inet6) 39 2 N 33 0 8 a :: DROP TABLE t1; diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mysql.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_mysql.result index 468e9fea41e..868b9902f5c 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mysql.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mysql.result @@ -4,12 +4,36 @@ Catalog: `def` Database: `test` Table: `t1` Org_table: `t1` -Type: STRING +Type: STRING (type=inet6) Collation: latin1_swedish_ci (8) Length: 39 Max_length: 0 Decimals: 0 Flags: UNSIGNED BINARY +Field 2: `b` +Catalog: `def` +Database: `` +Table: `` +Org_table: `` +Type: STRING (type=inet6) +Collation: latin1_swedish_ci (8) +Length: 39 +Max_length: 0 +Decimals: 0 +Flags: NOT_NULL UNSIGNED + +Field 3: `c` +Catalog: `def` +Database: `` +Table: `` +Org_table: `` +Type: STRING (type=inet6) +Collation: latin1_swedish_ci (8) +Length: 39 +Max_length: 0 +Decimals: 0 +Flags: UNSIGNED + DROP TABLE t1; diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_mysql.test b/plugin/type_inet/mysql-test/type_inet/type_inet6_mysql.test index 5e6ac6f3804..dfb300816d9 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_mysql.test +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_mysql.test @@ -2,5 +2,5 @@ -- source include/not_embedded.inc CREATE TABLE t1 (a INET6); ---exec $MYSQL -t test --column-type-info -e "SELECT * FROM t1" 2>&1 +--exec $MYSQL -t test --column-type-info -e "SELECT a, CAST('::' AS INET6) AS b, COALESCE(a) AS c FROM t1" 2>&1 DROP TABLE t1; |