Commit ec8d8c8d authored by unknown's avatar unknown

Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime


mysql-test/r/lock_multi.result:
  Null merge.
mysql-test/t/lock_multi.test:
  Null merge.
sql/sql_table.cc:
  Null merge.
parents eef14158 4b002635
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment