From 171f8badd73b56154e6cd53df9a64a543725ee1a Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Sun, 8 Apr 2007 00:05:34 +0500
Subject: [PATCH] merging fix

---
 mysql-test/r/windows.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/windows.result b/mysql-test/r/windows.result
index af1977bacbc..9f3828bff61 100644
--- a/mysql-test/r/windows.result
+++ b/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;