acinclude.m4:
  Auto merged
configure.in:
  Merge with 3.23
innobase/os/os0sync.c:
  No change
sql/sql_show.cc:
  No change