Commit 3920f19a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new


sql-common/client.c:
  Auto merged
parents c7df2c6a 4a945058

There are no changes