diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-10 15:46:20 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-10 15:46:20 -0300 |
| commit | d6ed8ccbfcc56065558581f40c669f135562f685 (patch) | |
| tree | 6585c71f3fae15baed31782015d75e99c441df20 /mysql-test/r | |
| parent | 4cf3621d79b0610bbe0ac9c27b4a0863a293b608 (diff) | |
| parent | 357430de54b391f52b7bb19d578132b386bfb163 (diff) | |
| download | mariadb-git-d6ed8ccbfcc56065558581f40c669f135562f685.tar.gz | |
Manual merge.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/ctype_recoding.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ctype_recoding.result b/mysql-test/r/ctype_recoding.result index 304e37facb1..ee95812c03e 100644 --- a/mysql-test/r/ctype_recoding.result +++ b/mysql-test/r/ctype_recoding.result @@ -165,7 +165,7 @@ CREATE TABLE `goodÐÌÏÈÏ` (a int); ERROR HY000: Invalid utf8 character string: 'ÐÌÏÈÏ' SET NAMES utf8; CREATE TABLE `goodÐÌÏÈÏ` (a int); -ERROR HY000: Invalid utf8 character string: 'ÐÌÏÈÏ` (a int)' +ERROR HY000: Invalid utf8 character string: 'ÐÌÏÈÏ' set names latin1; create table t1 (a char(10) character set koi8r, b text character set koi8r); insert into t1 values ('test','test'); |