configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged