Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
sql/item_func.cc:
  Auto merged
mysql-test/Makefile.am:
  Use local
This commit is contained in:
unknown 2006-11-14 09:49:35 +01:00
commit d9d3f62493

Diff content is not available