into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1


CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged