database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Post-merge fixes:

Browse Source 
- put back the result encoding in func_in.result (messed up by kdiff3)
- update .result for other tests (checked)
This commit is contained in:
Sergey Petrunya
2012-06-20 13:41:31 +04:00
parent 90fbd8b22b
commit 584d923c32
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/func_in.result
View File

@ -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'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'),(_latin1'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
select a from t1 where a in ('bbbb',_koi8r'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',_latin1'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>') 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