VC++Files/mysql.dsw:
  Auto merged
mysql-test/my_create_tables.c:
  Auto merged
mysql-test/my_manage.c:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged