From fc19d19d4aac361bbcd86c0ab539c6137943c55c Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.local>
Date: Fri, 4 Aug 2006 00:00:48 +0400
Subject: [PATCH] Fix a bug in the .dsp file. Ignore a symlink.

BitKeeper/etc/ignore:
  Added ndb/src/common/util/testBitmask.cpp to the ignore list
VC++Files/sql/mysqld.dsp:
  Fix a bug in the .dsp file.
---
 .bzrignore               | 1 +
 VC++Files/sql/mysqld.dsp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index 68e8120fae0..5e6c7509354 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1296,3 +1296,4 @@ vio/viotest-sslconnect.cpp
 vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
+ndb/src/common/util/testBitmask.cpp
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index 259c044e390..45c5e75beb5 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -1639,7 +1639,7 @@ SOURCE=.\sql_load.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sql\sql_locale.cpp
+SOURCE=.\sql_locale.cpp
 # End Source File
 # Begin Source File