sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_select.cc:
  Auto merged