diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-09 15:37:59 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-09 15:37:59 +0400 |
| commit | 6383a27b5323c8e033efd608e3f387d013d312ef (patch) | |
| tree | 2c12b6fd2894db12083ab482be40e695af20e8f0 /mysql-test/r/create.result | |
| parent | 6fb06a7aca02d04c14cae3b9ee4ef1714ece432c (diff) | |
| download | mariadb-git-6383a27b5323c8e033efd608e3f387d013d312ef.tar.gz | |
Separating CHARSET and COLLATION terms
mysql-test/r/alter_table.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/create.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/innodb.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/isam.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/select.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/show_check.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_blob.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_float.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_ranges.result:
SHOW FIELDS and SHOW CREATE TABLE now displays collation
sql/field.cc:
In field type charset rather than collation name is displayed
sql/sql_db.cc:
COLLATE clause has been added into SHOW CREATE DATABASE
sql/sql_lex.cc:
Detect charset names rather than collation names
sql/sql_show.cc:
COLLATION field has been added into SHOW FIELDS
sql/sql_yacc.yy:
COLLATE syntax has been added in CREATE TABLE/DATABASE
Diffstat (limited to 'mysql-test/r/create.result')
| -rw-r--r-- | mysql-test/r/create.result | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index a32d32a4ab7..affda14b4ba 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -75,37 +75,37 @@ drop table t1,t2; create table t1(x varchar(50) ); create table t2 select x from t1 where 1=2; describe t1; -Field Type Null Key Default Extra -x varchar(50) character set latin1 YES NULL +Field Type Collation Null Key Default Extra +x varchar(50) character set latin1 latin1 YES NULL describe t2; -Field Type Null Key Default Extra -x char(50) character set latin1 YES NULL +Field Type Collation Null Key Default Extra +x char(50) character set latin1 latin1 YES NULL drop table t2; create table t2 select now() as a , curtime() as b, curdate() as c , 1+1 as d , 1.0 + 1 as e , 33333333333333333 + 3 as f; describe t2; -Field Type Null Key Default Extra -a datetime 0000-00-00 00:00:00 -b time 00:00:00 -c date 0000-00-00 -d bigint(17) 0 -e double(18,1) 0.0 -f bigint(17) 0 +Field Type Collation Null Key Default Extra +a datetime latin1 0000-00-00 00:00:00 +b time latin1 00:00:00 +c date latin1 0000-00-00 +d bigint(17) binary 0 +e double(18,1) binary 0.0 +f bigint(17) binary 0 drop table t2; create table t2 select CAST("2001-12-29" AS DATE) as d, CAST("20:45:11" AS TIME) as t, CAST("2001-12-29 20:45:11" AS DATETIME) as dt; describe t2; -Field Type Null Key Default Extra -d date 0000-00-00 -t time 00:00:00 -dt datetime 0000-00-00 00:00:00 +Field Type Collation Null Key Default Extra +d date latin1 0000-00-00 +t time latin1 00:00:00 +dt datetime latin1 0000-00-00 00:00:00 drop table t1,t2; create table t1 (a tinyint); create table t2 (a int) select * from t1; describe t1; -Field Type Null Key Default Extra -a tinyint(4) YES NULL +Field Type Collation Null Key Default Extra +a tinyint(4) binary YES NULL describe t2; -Field Type Null Key Default Extra -a int(11) YES NULL +Field Type Collation Null Key Default Extra +a int(11) binary YES NULL drop table if exists t2; create table t2 (a int, a float) select * from t1; Duplicate column name 'a' |