Commit 60ad53cd authored by unknown's avatar unknown

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
parents 6eac9fa4 442afcf4
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment