summaryrefslogtreecommitdiff
path: root/mysql-test/r/select.result
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2003-05-23 13:10:25 +0500
committerbar@bar.mysql.r18.ru <>2003-05-23 13:10:25 +0500
commita238efaa632b7fccc44db08d0e468f38ce324dc7 (patch)
tree96a767e32ce6ec8ff92c231ff5d9fb1a819f69c5 /mysql-test/r/select.result
parent895db718ecd56bdb3e05d99ba42847ce5208548e (diff)
downloadmariadb-git-a238efaa632b7fccc44db08d0e468f38ce324dc7.tar.gz
SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:
Character set is not displayed in "Type" column anymore In "Collation" column NULL instead of BINARY is now displayd for for non-character data types
Diffstat (limited to 'mysql-test/r/select.result')
-rw-r--r--mysql-test/r/select.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 825a94c0ebf..8be189752ea 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3218,16 +3218,16 @@ show tables from test like "t?";
Tables_in_test (t?)
show full columns from t2;
Field Type Collation Null Key Default Extra Privileges Comment
-auto int(11) binary PRI NULL auto_increment select,insert,update,references
-fld1 int(6) unsigned zerofill binary UNI 000000 select,insert,update,references
-companynr tinyint(2) unsigned zerofill binary 00 select,insert,update,references
+auto int(11) NULL PRI NULL auto_increment select,insert,update,references
+fld1 int(6) unsigned zerofill NULL UNI 000000 select,insert,update,references
+companynr tinyint(2) unsigned zerofill NULL 00 select,insert,update,references
fld3 char(30) latin1_swedish_ci MUL select,insert,update,references
fld4 char(35) latin1_swedish_ci select,insert,update,references
fld5 char(35) latin1_swedish_ci select,insert,update,references
fld6 char(4) latin1_swedish_ci select,insert,update,references
show full columns from t2 from test like 'f%';
Field Type Collation Null Key Default Extra Privileges Comment
-fld1 int(6) unsigned zerofill binary UNI 000000 select,insert,update,references
+fld1 int(6) unsigned zerofill NULL UNI 000000 select,insert,update,references
fld3 char(30) latin1_swedish_ci MUL select,insert,update,references
fld4 char(35) latin1_swedish_ci select,insert,update,references
fld5 char(35) latin1_swedish_ci select,insert,update,references