Commit ed18d655 authored by unknown's avatar unknown

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

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


sql/mysql_priv.h:
  Auto merged
parents 9ba83543 3c5d8b40
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment