Merge kaamos.(none):/data/src/mysql-5.1

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

1 files changed, 3 insertions, 1 deletions

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d7e7be87d23..627464b1c56 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2983,7 +2983,9 @@ merge_key_fields(KEY_FIELD *start,KEY_FIELD *new_fields,KEY_FIELD *end,
 	  }
 	}
 	else if (old->eq_func && new_fields->eq_func &&
-		 old->val->eq(new_fields->val, old->field->binary()))
+                 old->val->eq_by_collation(new_fields->val, 
+                                           old->field->binary(),
+                                           old->field->charset()))
 
 	{
 	  old->level= and_level;