sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged