Merge bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged