diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-20 13:41:31 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-20 13:41:31 +0400 |
| commit | 584d923c3292395a2e8288adcf4795992789f27c (patch) | |
| tree | b322c2e1eb36244fee76d48a638bb25f0f604327 /mysql-test/r/func_in.result | |
| parent | 90fbd8b22b4b84cdc027fed26012efd87c2b6737 (diff) | |
| download | mariadb-git-584d923c3292395a2e8288adcf4795992789f27c.tar.gz | |
Post-merge fixes:
- put back the result encoding in func_in.result (messed up by kdiff3)
- update .result for other tests (checked)
Diffstat (limited to 'mysql-test/r/func_in.result')
| -rw-r--r-- | mysql-test/r/func_in.result | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result index f6d50764cc9..d25dcd40117 100644 --- a/mysql-test/r/func_in.result +++ b/mysql-test/r/func_in.result @@ -150,8 +150,8 @@ Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` A drop table t1; set names utf8; create table t1 (a char(10) character set utf8 not null); -insert into t1 values ('bbbb'),(_koi8r'ÃÃÃÃ'),(_latin1'ÄÄÄÄ'); -select a from t1 where a in ('bbbb',_koi8r'ÃÃÃÃ',_latin1'ÄÄÄÄ') order by a; +insert into t1 values ('bbbb'),(_koi8r'ÃÃÃÃ'),(_latin1'ÄÄÄÄ'); +select a from t1 where a in ('bbbb',_koi8r'ÃÃÃÃ',_latin1'ÄÄÄÄ') order by a; a ÄÄÄÄ bbbb @@ -811,3 +811,4 @@ a b select * from t1 where IF(1,a,a)='2.1'; a b drop table t1; +# End of 5.3 tests |