Review of new pushed code (Indentation fixes and simple optimizations)

Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files

mysql-test/t/ndb_blob.test

@@ -2,7 +2,7 @@
 
 --disable_warnings
 drop table if exists t1;
-drop database if exists test2;
+drop database if exists mysqltest;
 --enable_warnings
 
 #
@@ -214,8 +214,8 @@ select * from t1 order by a;
 
 # multi db
 
-create database test2;
-use test2;
+create database mysqltest;
+use mysqltest;
 
 CREATE TABLE t2 (
   a bigint unsigned NOT NULL PRIMARY KEY,
@@ -271,5 +271,5 @@ select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3)
 from t1 order by a;
 rollback;
 select count(*) from t1;
-
---drop table t1;
+drop table t1;
+drop database mysqltest;