into  mysql.com:/home/mydev/mysql-5.1-bug19815


mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
sql/sql_db.cc:
  SCCS merged