diff options
author | unknown <bar@bar.mysql.r18.ru> | 2003-07-15 18:11:49 +0500 |
---|---|---|
committer | unknown <bar@bar.mysql.r18.ru> | 2003-07-15 18:11:49 +0500 |
commit | db9b5f333e47754e170733202e9b76937ba9902d (patch) | |
tree | 7ce88c6d21fe3f85bfbfdd3ce0f2b7197259b54d /mysql-test | |
parent | 4b3eecf46b640b3601527ea59d819ddaec5820f8 (diff) | |
download | mariadb-git-db9b5f333e47754e170733202e9b76937ba9902d.tar.gz |
ELT passes the first argument in args[0] instead of having a separate Item.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/func_str.result | 4 | ||||
-rw-r--r-- | mysql-test/t/func_str.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 208efc51acb..12969449e3f 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'); -Illegal mix of collations (latin2_general_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE) for operation 'field' +ERROR HY000: 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'); -Illegal mix of collations (latin1_swedish_ci,COERCIBLE), (latin2_general_ci,COERCIBLE), (latin1_swedish_ci,COERCIBLE) for operation 'field' +ERROR HY000: 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 diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 7748694169f..38633e87c4b 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -167,9 +167,9 @@ select FIELD('b','A','B'); select FIELD('B','A','B'); select FIELD('b' COLLATE latin1_bin,'A','B'); select FIELD('b','A' COLLATE latin1_bin,'B'); ---error 1265 +--error 1268 select FIELD(_latin2'b','A','B'); ---error 1265 +--error 1268 select FIELD('b',_latin2'A','B'); select FIELD('b',_latin2'A','B',1); |