=== modified file 'sql/sql_base.cc'
--- old/sql/sql_base.cc	2011-04-12 10:59:59 +0000
+++ new/sql/sql_base.cc	2011-04-21 03:26:21 +0000
@@ -6975,6 +6975,17 @@
         *counter= i;
         *resolution= RESOLVED_IGNORING_ALIAS;
         break;
+      } 
+      else if (find->type() == Item::FUNC_ITEM && ((Item_func*) find)->functype() == Item_func::COLLATE_FUNC) 
+      {
+        Item *func_arg = ((Item_func*) find)->arguments()[0];
+        if (func_arg->name && item->name && !my_strcasecmp(system_charset_info, item->name, func_arg->name))
+        {
+          found = &item;
+          *counter = i;
+          *resolution = RESOLVED_AGAINST_ALIAS;
+          break;
+        }
       }
     }
     else if (table_name && item->type() == Item::REF_ITEM &&