into  mysql.com:/home/alexi/mysql-5.0


sql/item_strfunc.cc:
  Auto merged
mysql-test/t/select.test:
  Merging BUG#XXX to 5.0 (test, will not push)