into  mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/bug18198


sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_timefunc.h:
  SCCS merged