into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged