merging fix

mysql-test/r/windows.result:
  result fixed

mysql-test/r/windows.result

@@ -40,4 +40,4 @@ PARTITION p1 VALUES LESS THAN (3) ENGINE=INNODB
 data DIRECTORY='c:/tmp/'
                 index DIRECTORY = 'c:/tmp/'
 );
-drop table t1;
+DROP TABLE t1;