Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
vio/viosslfactories.c:
  Auto merged