summaryrefslogtreecommitdiff
path: root/mysql-test/r/ctype_utf8.result
diff options
context:
space:
mode:
authorunknown <bar@mysql.com/bar.myoffice.izhnet.ru>2007-10-16 15:22:44 +0500
committerunknown <bar@mysql.com/bar.myoffice.izhnet.ru>2007-10-16 15:22:44 +0500
commit1590fa13ff044c1c779a11b716394fc76453424e (patch)
treed088f9b58f5c24cea64bfeee223058466cb81eab /mysql-test/r/ctype_utf8.result
parentd3443ee1c7cfc4465c674adf32ba8c119c9212f3 (diff)
downloadmariadb-git-1590fa13ff044c1c779a11b716394fc76453424e.tar.gz
After merge fix:
Adjusting SHOW CREATE TABLE output from 5.0 to 5.1 format mysql-test/r/ctype_uca.result: Adjusting SHOW CREATE TABLE output mysql-test/r/ctype_ucs.result: Adjusting SHOW CREATE TABLE output mysql-test/r/ctype_utf8.result: Adjusting SHOW CREATE TABLE output mysql-test/r/func_regexp.result: Adjusting SHOW CREATE TABLE output
Diffstat (limited to 'mysql-test/r/ctype_utf8.result')
-rw-r--r--mysql-test/r/ctype_utf8.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index 0981f72b0c1..3575a07d83c 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -276,8 +276,8 @@ select null, null;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `s1` varchar(64) character set utf8 default NULL,
- `s2` varchar(64) character set utf8 default NULL
+ `s1` varchar(64) CHARACTER SET utf8 DEFAULT NULL,
+ `s2` varchar(64) CHARACTER SET utf8 DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
delete from t1;
insert into t1 values('aaa','aaa');