into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


sql/sql_class.cc:
  Auto merged