sql/item_func.cc:
  Auto merged
mysql-test/r/type_newdecimal.result:
  resolving
mysql-test/t/type_newdecimal.test:
  resolving