libmysqld/libmysqld.c:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged