diff options
| author | bar@bar.mysql.r18.ru <> | 2003-01-09 15:37:59 +0400 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-01-09 15:37:59 +0400 |
| commit | a89df5a09691fbdab3c267a4a3172f29e5611803 (patch) | |
| tree | 2c12b6fd2894db12083ab482be40e695af20e8f0 /mysql-test/r/select.result | |
| parent | 4df915a7b50ed4a69f77c7968f437d66f9412d9e (diff) | |
| download | mariadb-git-a89df5a09691fbdab3c267a4a3172f29e5611803.tar.gz | |
Separating CHARSET and COLLATION terms
Diffstat (limited to 'mysql-test/r/select.result')
| -rw-r--r-- | mysql-test/r/select.result | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index c70dec6f9eb..bba10f408cb 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -3217,23 +3217,23 @@ Tables_in_test (s%) show tables from test like "t?"; Tables_in_test (t?) show full columns from t2; -Field Type Null Key Default Extra Privileges Comment -auto int(11) PRI NULL auto_increment select,insert,update,references -fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references -companynr tinyint(2) unsigned zerofill 00 select,insert,update,references -fld3 char(30) character set latin1 MUL select,insert,update,references -fld4 char(35) character set latin1 select,insert,update,references -fld5 char(35) character set latin1 select,insert,update,references -fld6 char(4) character set latin1 select,insert,update,references +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 +fld3 char(30) character set latin1 latin1 MUL select,insert,update,references +fld4 char(35) character set latin1 latin1 select,insert,update,references +fld5 char(35) character set latin1 latin1 select,insert,update,references +fld6 char(4) character set latin1 latin1 select,insert,update,references show full columns from t2 from test like 'f%'; -Field Type Null Key Default Extra Privileges Comment -fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references -fld3 char(30) character set latin1 MUL select,insert,update,references -fld4 char(35) character set latin1 select,insert,update,references -fld5 char(35) character set latin1 select,insert,update,references -fld6 char(4) character set latin1 select,insert,update,references +Field Type Collation Null Key Default Extra Privileges Comment +fld1 int(6) unsigned zerofill binary UNI 000000 select,insert,update,references +fld3 char(30) character set latin1 latin1 MUL select,insert,update,references +fld4 char(35) character set latin1 latin1 select,insert,update,references +fld5 char(35) character set latin1 latin1 select,insert,update,references +fld6 char(4) character set latin1 latin1 select,insert,update,references show full columns from t2 from test like 's%'; -Field Type Null Key Default Extra Privileges Comment +Field Type Collation Null Key Default Extra Privileges Comment show keys from t2; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t2 0 PRIMARY 1 auto A 1199 NULL NULL BTREE |