Merge mysql.com:/home/my/mysql-5.0

into mysql.com:/home/my/mysql-5.1

Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
6d78655a · monty@narttu.mysql.fi · f0ae3ce9 · 8f4fef29 · 6d78655a
Commit 6d78655a authored Feb 23, 2007 by monty@narttu.mysql.fi
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

.bzrignore .bzrignore +1 -1

No files found.
--- a/.bzrignore
+++ b/.bzrignore
@@ -2664,6 +2664,7 @@ storage/ndb/src/mgmclient/test_cpcd/*.d
 storage/ndb/src/mgmsrv/ndb_mgmd
 storage/ndb/src/mgmsrv/ndb_mgmd.dsp
 storage/ndb/src/ndbapi/libndbapi.dsp
+storage/ndb/src/ndbapi/ndberror_check
 storage/ndb/test/ndbapi/DbAsyncGenerator
 storage/ndb/test/ndbapi/DbCreate
 storage/ndb/test/ndbapi/bank/bankCreator
@@ -2951,4 +2952,3 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
-storage/ndb/src/ndbapi/ndberror_check