Tweaks for duplicate and missing lines in tests from a huge merge.

mysql-test/r/type_newdecimal.result:
  Make test clean up after itself.
mysql-test/t/ps_1general.test:
  Remove improperly merged lines.
mysql-test/t/type_newdecimal.test:
  Make test clean up after itself.

mysql-test/r/type_newdecimal.result

@@ -1406,6 +1406,7 @@ alter table t1 modify a decimal(10,2);
 select * from t1;
 a
 123.12
+drop table t1;
 create table t1 (i int, j int);
 insert into t1 values (1,1), (1,2), (2,3), (2,4);
 select i, count(distinct j) from t1 group by i;

mysql-test/t/ps_1general.test

@@ -324,9 +324,6 @@ execute stmt4;
 # history (actions of the bdb engine).
 # That is the reason why, we switch the output here off.
 #   (The real output will be tested in ps_6bdb.test)
---disable_warnings
-prepare stmt4 from ' show engine bdb logs ';
---enable_warnings
 --disable_result_log
 prepare stmt4 from ' show engine bdb logs ';
 execute stmt4;

mysql-test/t/type_newdecimal.test

@@ -1105,6 +1105,7 @@ insert into t1 values(123.12);
 select * from t1;
 alter table t1 modify a decimal(10,2);
 select * from t1;
+drop table t1;
 
 #
 # Bug#19667 group by a decimal expression yields wrong result