Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into mysql.com:/home/my/mysql-5.0 client/mysql_upgrade.c: manual merge
This commit is contained in:
commit
60ad53cd41
into mysql.com:/home/my/mysql-5.0 client/mysql_upgrade.c: manual merge