Commit 560bc0ea authored by unknown's avatar unknown

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my50-bug19799

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799


mysql-test/r/mysql.result:
  Auto merged
parents 1a922cda bd82fb52
...@@ -38,6 +38,7 @@ t2 ...@@ -38,6 +38,7 @@ t2
t3 t3
Database Database
information_schema information_schema
cluster
mysql mysql
test test
_ _
......
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