summaryrefslogtreecommitdiff
path: root/mysql-test/r/isam.result
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2003-01-09 15:37:59 +0400
committerbar@bar.mysql.r18.ru <>2003-01-09 15:37:59 +0400
commita89df5a09691fbdab3c267a4a3172f29e5611803 (patch)
tree2c12b6fd2894db12083ab482be40e695af20e8f0 /mysql-test/r/isam.result
parent4df915a7b50ed4a69f77c7968f437d66f9412d9e (diff)
downloadmariadb-git-a89df5a09691fbdab3c267a4a3172f29e5611803.tar.gz
Separating CHARSET and COLLATION terms
Diffstat (limited to 'mysql-test/r/isam.result')
-rw-r--r--mysql-test/r/isam.result16
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result
index 85641055fe6..7871e899773 100644
--- a/mysql-test/r/isam.result
+++ b/mysql-test/r/isam.result
@@ -64,15 +64,15 @@ Table Op Msg_type Msg_text
test.t2 check error Table 't2' was not locked with LOCK TABLES
test.t1 check status OK
show columns from t1;
-Field Type Null Key Default Extra
-a int(11) PRI 0
-b int(11) MUL 0
-c int(11) 0
+Field Type Collation Null Key Default Extra
+a int(11) binary PRI 0
+b int(11) binary MUL 0
+c int(11) binary 0
show full columns from t1;
-Field Type Null Key Default Extra Privileges Comment
-a int(11) PRI 0 select,insert,update,references
-b int(11) MUL 0 select,insert,update,references
-c int(11) 0 select,insert,update,references
+Field Type Collation Null Key Default Extra Privileges Comment
+a int(11) binary PRI 0 select,insert,update,references
+b int(11) binary MUL 0 select,insert,update,references
+c int(11) binary 0 select,insert,update,references
show index from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 a A 4 NULL NULL BTREE