Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mashka.mysql.fi:/home/my/mysql-4.1

1 files changed, 10 insertions, 0 deletions

diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index f158eaa3764..4c996121446 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -305,3 +305,13 @@ select SUBSTR('abcdefg',-1,5) FROM DUAL;
 select SUBSTR('abcdefg',0,0) FROM DUAL;
 select SUBSTR('abcdefg',-1,-1) FROM DUAL;
 select SUBSTR('abcdefg',1,-1) FROM DUAL;
+
+#
+# Test that fix_fields doesn't follow to upper level (to comparison)
+# when an error on a lower level (in concat) has accured:
+#
+create table t7 (s1 char);
+--error 1265
+select * from t7
+where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci) = 'AA';
+drop table t7;