Commit ac65eb47 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge 

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/collapsed:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
parents 36dfa434 181c9b4d

There are no changes