into mysql.com:/home/mydev/mysql-5.1-amerge
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 of team tree
mysql-test/t/lock_multi.test:
Manual merge of team tree