diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-29 13:37:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-29 13:37:18 +0200 |
| commit | d9bab412e99adce6f9f81c141a42a2d66c77189e (patch) | |
| tree | 7c1da25ad9e6681298ac052f8f4f6b4499063231 /mysql-test/suite/gcol | |
| parent | c5520a37d6111991157d8da91b1ae4b9e7cbf50c (diff) | |
| download | mariadb-git-d9bab412e99adce6f9f81c141a42a2d66c77189e.tar.gz | |
update test results for embedded
followup for da5c3e03f62
Diffstat (limited to 'mysql-test/suite/gcol')
| -rw-r--r-- | mysql-test/suite/gcol/r/gcol_bugfixes.result | 11 | ||||
| -rw-r--r-- | mysql-test/suite/gcol/t/gcol_bugfixes.test | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mysql-test/suite/gcol/r/gcol_bugfixes.result b/mysql-test/suite/gcol/r/gcol_bugfixes.result index 9431632b370..fd40515225e 100644 --- a/mysql-test/suite/gcol/r/gcol_bugfixes.result +++ b/mysql-test/suite/gcol/r/gcol_bugfixes.result @@ -583,9 +583,10 @@ sidea DOUBLE, sideb DOUBLE, sidec DOUBLE AS (SQRT(sidea * sidea + sideb * sideb)) ); -SELECT * FROM information_schema.columns WHERE table_name='gcol_t1'; -TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION -def test gcol_t1 sidea 1 NULL YES double NULL NULL 22 NULL NULL NULL NULL double select,insert,update,references NEVER NULL -def test gcol_t1 sideb 2 NULL YES double NULL NULL 22 NULL NULL NULL NULL double select,insert,update,references NEVER NULL -def test gcol_t1 sidec 3 NULL YES double NULL NULL 22 NULL NULL NULL NULL double VIRTUAL GENERATED select,insert,update,references ALWAYS sqrt(`sidea` * `sidea` + `sideb` * `sideb`) +SELECT table_schema,table_name,column_name,extra,is_generated,generation_expression +FROM information_schema.columns WHERE table_name='gcol_t1'; +table_schema table_name column_name extra is_generated generation_expression +test gcol_t1 sidea NEVER NULL +test gcol_t1 sideb NEVER NULL +test gcol_t1 sidec VIRTUAL GENERATED ALWAYS sqrt(`sidea` * `sidea` + `sideb` * `sideb`) DROP TABLE gcol_t1; diff --git a/mysql-test/suite/gcol/t/gcol_bugfixes.test b/mysql-test/suite/gcol/t/gcol_bugfixes.test index 1318abee79a..4acae77e830 100644 --- a/mysql-test/suite/gcol/t/gcol_bugfixes.test +++ b/mysql-test/suite/gcol/t/gcol_bugfixes.test @@ -547,6 +547,7 @@ CREATE TABLE gcol_t1 ( sidec DOUBLE AS (SQRT(sidea * sidea + sideb * sideb)) ); -SELECT * FROM information_schema.columns WHERE table_name='gcol_t1'; +SELECT table_schema,table_name,column_name,extra,is_generated,generation_expression +FROM information_schema.columns WHERE table_name='gcol_t1'; DROP TABLE gcol_t1; |