into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Null-merged, as this doesn't apply after 5.1.4 .  -cm