summaryrefslogtreecommitdiff
path: root/mysql-test/r/create.result
diff options
context:
space:
mode:
authorAlfranio Correia <alfranio.correia@sun.com>2008-12-13 19:42:12 +0000
committerAlfranio Correia <alfranio.correia@sun.com>2008-12-13 19:42:12 +0000
commit19f859a27e60270f3cdc7e2edc34e88c29536c21 (patch)
tree3ca8c469534126c025304d8d96dbeb2b359a6c00 /mysql-test/r/create.result
parent5c16a315ca28c18949e27b91cddf0886329d1dd4 (diff)
parentba816c14a9bc8012759da9d58f858f1e73bec708 (diff)
downloadmariadb-git-19f859a27e60270f3cdc7e2edc34e88c29536c21.tar.gz
merge 5.1 --> 5.1-rpl
Diffstat (limited to 'mysql-test/r/create.result')
-rw-r--r--mysql-test/r/create.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 66258aa3eca..1842fb8b1dd 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1754,8 +1754,8 @@ create table t1 like information_schema.character_sets;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
- `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+ `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+ `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
`DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
`MAXLEN` bigint(3) NOT NULL DEFAULT '0'
) ENGINE=MEMORY DEFAULT CHARSET=utf8