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
This commit is contained in:
unknown 2006-11-13 13:10:03 +01:00
commit ac65eb473e

Diff Content Not Available