summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorbar@gw.udmsearch.izhnet.ru <>2002-06-07 17:23:33 +0500
committerbar@gw.udmsearch.izhnet.ru <>2002-06-07 17:23:33 +0500
commit1a91646854196e7690ef6d915ae3f7fdf6d05543 (patch)
tree373045c1e640111ad3fe37dcee286991bf677594 /mysql-test/r/merge.result
parentb62fafaa1507f057988c1d0fa7a2bda81ca71cec (diff)
downloadmariadb-git-1a91646854196e7690ef6d915ae3f7fdf6d05543.tar.gz
Charset of any string field now can be specified during CREATE TABLE
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 9b72ff26350..6de77f7bdaa 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -172,7 +172,7 @@ show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
`a` int(11) NOT NULL default '0',
- `b` char(20) default NULL,
+ `b` char(20) character set latin1 default NULL,
KEY `a` (`a`)
) TYPE=MRG_MyISAM UNION=(t1,t2)
create table t4 (a int not null, b char(10), key(a)) type=MERGE UNION=(t1,t2);