client/mysql.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged