Commit 18b29ab4 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 4a5e9e31 4566c09d
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