into krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new sql/lock.cc: Auto merged
Attach a file by drag & drop or click to upload
