summaryrefslogtreecommitdiff
path: root/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-06-29 00:57:20 +0200
committerSergei Golubchik <serg@mariadb.org>2017-07-05 17:15:59 +0200
commit291411c96ceb914950731df6c36b32fc83b58acf (patch)
treeb06bd0acfcc32bd0ddce7dc1c254c8db076c145f /mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
parent0559f12972dba6a141de553aacd724b2bcfaf71d (diff)
downloadmariadb-git-291411c96ceb914950731df6c36b32fc83b58acf.tar.gz
MDEV-13132 Information Schema does not show whether column default is expression or literal
Fix INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT to be standard-compliant, but keep SHOW COLUMNS backward-compatibly unchanged.
Diffstat (limited to 'mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result')
-rw-r--r--mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result32
1 files changed, 16 insertions, 16 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result b/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
index b025776cf44..ae2b05c058e 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
@@ -521,15 +521,15 @@ def test tb1 f7 7 NULL YES longtext 4294967295 4294967295 NULL NULL NULL latin1
def test tb1 f8 8 NULL YES tinyblob 255 255 NULL NULL NULL NULL NULL tinyblob NEVER NULL
def test tb1 f9 9 NULL YES blob 65535 65535 NULL NULL NULL NULL NULL blob NEVER NULL
def test tb2 f100 42 00000000000000000008.8 NO double NULL NULL 22 NULL NULL NULL NULL double unsigned zerofill NEVER NULL
-def test tb2 f101 43 2000-01-01 NO date NULL NULL NULL NULL NULL NULL NULL date NEVER NULL
-def test tb2 f102 44 00:00:20 NO time NULL NULL NULL NULL 0 NULL NULL time NEVER NULL
-def test tb2 f103 45 0002-02-02 00:00:00 NO datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL
-def test tb2 f104 46 2000-12-31 23:59:59 NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp NEVER NULL
+def test tb2 f101 43 '2000-01-01' NO date NULL NULL NULL NULL NULL NULL NULL date NEVER NULL
+def test tb2 f102 44 '00:00:20' NO time NULL NULL NULL NULL 0 NULL NULL time NEVER NULL
+def test tb2 f103 45 '0002-02-02 00:00:00' NO datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL
+def test tb2 f104 46 '2000-12-31 23:59:59' NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp NEVER NULL
def test tb2 f105 47 2000 NO year NULL NULL NULL NULL NULL NULL NULL year(4) NEVER NULL
def test tb2 f106 48 2000 NO year NULL NULL NULL NULL NULL NULL NULL year(4) NEVER NULL
def test tb2 f107 49 2000 NO year NULL NULL NULL NULL NULL NULL NULL year(4) NEVER NULL
-def test tb2 f108 50 1enum NO enum 5 5 NULL NULL NULL latin1 latin1_swedish_ci enum('1enum','2enum') NEVER NULL
-def test tb2 f109 51 1set NO set 9 9 NULL NULL NULL latin1 latin1_swedish_ci set('1set','2set') NEVER NULL
+def test tb2 f108 50 '1enum' NO enum 5 5 NULL NULL NULL latin1 latin1_swedish_ci enum('1enum','2enum') NEVER NULL
+def test tb2 f109 51 '1set' NO set 9 9 NULL NULL NULL latin1 latin1_swedish_ci set('1set','2set') NEVER NULL
def test tb2 f110 52 NULL YES varbinary 64 64 NULL NULL NULL NULL NULL varbinary(64) NEVER NULL
def test tb2 f111 53 NULL YES varbinary 27 27 NULL NULL NULL NULL NULL varbinary(27) NEVER NULL
def test tb2 f112 54 NULL YES varbinary 64 64 NULL NULL NULL NULL NULL varbinary(64) NEVER NULL
@@ -579,9 +579,9 @@ def test tb2 f96 38 8.8 NO double NULL NULL 22 NULL NULL NULL NULL double unsign
def test tb2 f97 39 0000000008.8 NO float NULL NULL 12 NULL NULL NULL NULL float unsigned zerofill NEVER NULL
def test tb2 f98 40 00000000000000000008.8 NO double NULL NULL 22 NULL NULL NULL NULL double unsigned zerofill NEVER NULL
def test tb2 f99 41 0000000008.8 NO float NULL NULL 12 NULL NULL NULL NULL float unsigned zerofill NEVER NULL
-def test tb3 f118 1 a NO char 1 1 NULL NULL NULL latin1 latin1_swedish_ci char(1) NEVER NULL
-def test tb3 f119 2  NO char 1 1 NULL NULL NULL latin1 latin1_bin char(1) NEVER NULL
-def test tb3 f120 3  NO char 1 1 NULL NULL NULL latin1 latin1_swedish_ci char(1) NEVER NULL
+def test tb3 f118 1 'a' NO char 1 1 NULL NULL NULL latin1 latin1_swedish_ci char(1) NEVER NULL
+def test tb3 f119 2 '' NO char 1 1 NULL NULL NULL latin1 latin1_bin char(1) NEVER NULL
+def test tb3 f120 3 '' NO char 1 1 NULL NULL NULL latin1 latin1_swedish_ci char(1) NEVER NULL
def test tb3 f121 4 NULL YES tinytext 255 255 NULL NULL NULL latin1 latin1_swedish_ci tinytext NEVER NULL
def test tb3 f122 5 NULL YES text 65535 65535 NULL NULL NULL latin1 latin1_swedish_ci text NEVER NULL
def test tb3 f123 6 NULL YES mediumtext 16777215 16777215 NULL NULL NULL latin1 latin1_swedish_ci mediumtext NEVER NULL
@@ -590,7 +590,7 @@ def test tb3 f125 8 NULL YES tinyblob 255 255 NULL NULL NULL NULL NULL tinyblob
def test tb3 f126 9 NULL YES blob 65535 65535 NULL NULL NULL NULL NULL blob NEVER NULL
def test tb3 f127 10 NULL YES mediumblob 16777215 16777215 NULL NULL NULL NULL NULL mediumblob NEVER NULL
def test tb3 f128 11 NULL YES longblob 4294967295 4294967295 NULL NULL NULL NULL NULL longblob NEVER NULL
-def test tb3 f129 12  NO binary 1 1 NULL NULL NULL NULL NULL binary(1) NEVER NULL
+def test tb3 f129 12 '' NO binary 1 1 NULL NULL NULL NULL NULL binary(1) NEVER NULL
def test tb3 f130 13 99 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(4) NEVER NULL
def test tb3 f131 14 99 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(3) unsigned NEVER NULL
def test tb3 f132 15 099 NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(3) unsigned zerofill NEVER NULL
@@ -705,15 +705,15 @@ def test tb4 f240 65 NULL YES varchar 120 120 NULL NULL NULL latin1 latin1_swedi
def test tb4 f241 66 NULL YES char 100 100 NULL NULL NULL latin1 latin1_swedish_ci char(100) NEVER NULL
def test tb4 f242 67 NULL YES bit NULL NULL 30 NULL NULL NULL NULL bit(30) NEVER NULL
def test1 tb2 f100 42 00000000000000000008.8 NO double NULL NULL 22 NULL NULL NULL NULL double unsigned zerofill NEVER NULL
-def test1 tb2 f101 43 2000-01-01 NO date NULL NULL NULL NULL NULL NULL NULL date NEVER NULL
-def test1 tb2 f102 44 00:00:20 NO time NULL NULL NULL NULL 0 NULL NULL time NEVER NULL
-def test1 tb2 f103 45 0002-02-02 00:00:00 NO datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL
-def test1 tb2 f104 46 2000-12-31 23:59:59 NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp NEVER NULL
+def test1 tb2 f101 43 '2000-01-01' NO date NULL NULL NULL NULL NULL NULL NULL date NEVER NULL
+def test1 tb2 f102 44 '00:00:20' NO time NULL NULL NULL NULL 0 NULL NULL time NEVER NULL
+def test1 tb2 f103 45 '0002-02-02 00:00:00' NO datetime NULL NULL NULL NULL 0 NULL NULL datetime NEVER NULL
+def test1 tb2 f104 46 '2000-12-31 23:59:59' NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp NEVER NULL
def test1 tb2 f105 47 2000 NO year NULL NULL NULL NULL NULL NULL NULL year(4) NEVER NULL
def test1 tb2 f106 48 2000 NO year NULL NULL NULL NULL NULL NULL NULL year(4) NEVER NULL
def test1 tb2 f107 49 2000 NO year NULL NULL NULL NULL NULL NULL NULL year(4) NEVER NULL
-def test1 tb2 f108 50 1enum NO enum 5 5 NULL NULL NULL latin1 latin1_swedish_ci enum('1enum','2enum') NEVER NULL
-def test1 tb2 f109 51 1set NO set 9 9 NULL NULL NULL latin1 latin1_swedish_ci set('1set','2set') NEVER NULL
+def test1 tb2 f108 50 '1enum' NO enum 5 5 NULL NULL NULL latin1 latin1_swedish_ci enum('1enum','2enum') NEVER NULL
+def test1 tb2 f109 51 '1set' NO set 9 9 NULL NULL NULL latin1 latin1_swedish_ci set('1set','2set') NEVER NULL
def test1 tb2 f110 52 NULL YES varbinary 64 64 NULL NULL NULL NULL NULL varbinary(64) NEVER NULL
def test1 tb2 f111 53 NULL YES varbinary 27 27 NULL NULL NULL NULL NULL varbinary(27) NEVER NULL
def test1 tb2 f112 54 NULL YES varbinary 64 64 NULL NULL NULL NULL NULL varbinary(64) NEVER NULL