Commit 48eae98c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_base.cc:
  Auto merged
parents 74b51205 a3011fab

There are no changes