Commit c9e647e3 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

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


BUILD/check-cpu:
  Auto merged
sql/item_func.h:
  Auto merged
sql-common/client.c:
  Auto merged
parents f83f742b 5373a7ec

There are no changes