Commit 18b29ab4 authored by unknown's avatar unknown
Browse files

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

There are no changes