into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


include/mysql_com.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged