Commit a88d3296 authored by unknown's avatar unknown
Browse files

Merge production.mysql.com:/usersnfs/rburnett/tmp_merge 

into  production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt


sql-common/client.c:
  Auto merged
parents 7cbb068c 256ac388

There are no changes