Commit 560bc0ea authored by unknown's avatar unknown
Browse files

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
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ t2
t3
Database
information_schema
cluster
mysql
test
_