into  polly.local:/home/kaa/src/maint/bug27643/my51-bug27643


mysql-test/r/ctype_ucs2_def.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
mysql-test/t/ctype_ucs2_def.test:
  Auto merged
mysql-test/t/heap_hash.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged