unknown d9d1337e2e Merge mysql.com:/home/jimw/my/mysql-4.1-clean ...

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/t/union.test:
  Resolve conflict

2005-11-29 15:33:58 -08:00

28 KiB

Raw Blame History

View Raw