Commit 4da4d933 authored by unknown's avatar unknown

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/mysql_priv.h:
  Auto merged
parents 68d662fb 160aec7f
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