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