into  xiphis.org:/home/antony/work2/p2-bug20168.2


sql/sql_db.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
mysql-test/r/lock_multi.result:
  manual merge
mysql-test/t/lock_multi.test:
  manual merge