into mysql.com:/home/cps/mysql/devel/im-fix-review


include/my_sys.h:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged