into mysql.com:/home/bk/b7879-mysql-4.0


sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged