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