mysql-test/r/lock.result:
  Fixed wrong result for lock
mysql-test/t/lock.test:
  Added timeouts to make test repeatable