include/my_global.h:
  Auto merged
configure.in:
  Manual merge from 4.0.26 (bypassing intermediate trees, due to unmerged changes):
  Use "local" (= existing 5.1) version.