Commit e45deb96 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


sql-common/client.c:
  Auto merged
parents 2fec5b43 256ac388

There are no changes