into  magare.gmz:/home/kgeorge/mysql/work/B19390-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_trigger.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_trigger.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/unireg.cc:
  Auto merged
mysql-test/r/union.result:
  Merged bug 27848 to 5.1-opt
mysql-test/t/union.test:
  Merged bug 27848 to 5.1-opt
sql/sql_yacc.yy:
  Merged bug 27848 to 5.1-opt