Commit 1881223a authored by unknown's avatar unknown

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
parents d9a59899 5a124bd9
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