into  mysql.com:/misc/mysql/24907/51-24907


mysql-test/r/type_newdecimal.result:
  manual merge
mysql-test/t/type_newdecimal.test:
  manual merge
sql/sql_select.cc:
  manual merge