Commit 7f993fa6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents 43d17730 6d9a7969

There are no changes