unknown baf5c2c132 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt ...

into  linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/union.result:
  Bug#32848: Manual merge
mysql-test/t/union.test:
  Bug#32848: Manual merge

2007-12-21 14:52:39 +01:00

34 KiB

Raw Blame History

View Raw