• unknown's avatar
    Merge magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt · ee8ab6d9
    unknown authored
    into  magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.1-opt
    
    
    mysql-test/r/func_group.result:
      Auto merged
    mysql-test/r/type_decimal.result:
      Auto merged
    mysql-test/t/func_group.test:
      Auto merged
    mysql-test/t/type_decimal.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/opt_sum.cc:
      merge bug 30715 to 5.1-opt
    ee8ab6d9
func_group.test 29.3 KB