diff options
| author | unknown <serg@serg.mylan> | 2003-07-15 14:58:04 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-07-15 14:58:04 +0200 |
| commit | 5aa330863bad40282cd26feb3bacf105f785032c (patch) | |
| tree | f96f1bb78939f05b9e3cfc29c02f3823b908475c /mysql-test/r | |
| parent | 5c0075496ec02ab882cd5e8b5e12a4e159d92047 (diff) | |
| parent | 4b3eecf46b640b3601527ea59d819ddaec5820f8 (diff) | |
| download | mariadb-git-5aa330863bad40282cd26feb3bacf105f785032c.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/item_func.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_str.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 611660675c8..208efc51acb 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -297,9 +297,9 @@ select FIELD('b','A' COLLATE latin1_bin,'B'); FIELD('b','A' COLLATE latin1_bin,'B') 0 select FIELD(_latin2'b','A','B'); -ERROR HY000: Illegal mix of collations for operation 'field' +Illegal mix of collations (latin2_general_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE) for operation 'field' select FIELD('b',_latin2'A','B'); -ERROR HY000: Illegal mix of collations for operation 'field' +Illegal mix of collations (latin1_swedish_ci,COERCIBLE), (latin2_general_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE) for operation 'field' select FIELD('b',_latin2'A','B',1); FIELD('b',_latin2'A','B',1) 1 |