Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0

2 files changed, 31 insertions, 0 deletions

diff --git a/mysql-test/r/binary.result b/mysql-test/r/binary.result
index 2de8b01bc3a..054918e8df3 100644
--- a/mysql-test/r/binary.result
+++ b/mysql-test/r/binary.result
@@ -80,3 +80,21 @@ NULL
 select b from t1 having binary b like '';
 b
 drop table t1;
+create table t1( firstname char(20), lastname char(20));
+insert into t1 values ("john","doe"),("John","Doe");
+select * from t1 where firstname='john' and firstname like binary 'john';
+firstname	lastname
+john	doe
+select * from t1 where firstname='john' and binary 'john' = firstname;
+firstname	lastname
+john	doe
+select * from t1 where firstname='john' and firstname = binary 'john';
+firstname	lastname
+john	doe
+select * from t1 where firstname='John' and firstname like binary 'john';
+firstname	lastname
+john	doe
+select * from t1 where firstname='john' and firstname like binary 'John';
+firstname	lastname
+John	Doe
+drop table t1;
diff --git a/mysql-test/t/binary.test b/mysql-test/t/binary.test
index 95815cda60f..a8c724bf33b 100644
--- a/mysql-test/t/binary.test
+++ b/mysql-test/t/binary.test
@@ -49,3 +49,16 @@ select b from t1 where binary b like '';
 select b from t1 group by binary b like '';
 select b from t1 having binary b like '';
 drop table t1;
+
+#
+# Bug5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
+#
+
+create table t1( firstname char(20), lastname char(20));
+insert into t1 values ("john","doe"),("John","Doe");
+select * from t1 where firstname='john' and firstname like binary 'john';
+select * from t1 where firstname='john' and binary 'john' = firstname;
+select * from t1 where firstname='john' and firstname = binary 'john';
+select * from t1 where firstname='John' and firstname like binary 'john';
+select * from t1 where firstname='john' and firstname like binary 'John';
+drop table t1;