Commit 9cd17b6c authored by unknown's avatar unknown
Browse files

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

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


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 55fbeec1 158b0603

There are no changes