• unknown's avatar
    Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912 · 59a35c9a
    unknown authored
    into  polly.local:/home/kaa/src/maint/bug24912/my51-bug24912
    
    
    mysql-test/r/type_newdecimal.result:
      Auto merged
    mysql-test/t/func_math.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    mysql-test/r/func_math.result:
      Manual merge.
    sql/item_strfunc.cc:
      Manual merge.
    59a35c9a
func_math.result 15.4 KB