Commit 456cc52e authored by unknown's avatar unknown
Browse files

Merge magare.gmz:/home/kgeorge/mysql/work/B26815-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B26815-5.0-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 8aa2d6bf 40c1a3f9

There are no changes