Commit dc48dcb8 authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-5.0-axmrg 

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_class.h:
  Auto merged
parents 11dbbd08 885de571

There are no changes