diff options
| author | unknown <jonas@eel.(none)> | 2005-09-09 12:54:03 +0200 |
|---|---|---|
| committer | unknown <jonas@eel.(none)> | 2005-09-09 12:54:03 +0200 |
| commit | 011f12d01419e71252bd12c963eaa6c038e52945 (patch) | |
| tree | f78ef8fd4043b73f79e883d70cf2bd1aa00353f8 /.bzrignore | |
| parent | c9106a95374162e2e633e49fd378489fd2c535f8 (diff) | |
| parent | b1fab24ce22695221f022fd825391b2475ff0908 (diff) | |
| download | mariadb-git-011f12d01419e71252bd12c963eaa6c038e52945.tar.gz | |
Merge eel.(none):/home/jonas/src/mysql-4.1
into eel.(none):/home/jonas/src/mysql-5.0
BitKeeper/etc/ignore:
auto-union
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
ndb/test/ndbapi/Makefile.am:
merge
ndb/test/ndbapi/bank/Bank.cpp:
merge
ndb/test/ndbapi/bank/Bank.hpp:
merge
ndb/test/src/UtilTransactions.cpp:
merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 00d207919a8..3932ed4d127 100644 --- a/.bzrignore +++ b/.bzrignore @@ -859,6 +859,7 @@ ndb/test/ndbapi/testNodeRestart ndb/test/ndbapi/testOIBasic ndb/test/ndbapi/testOperations ndb/test/ndbapi/testRestartGci +ndb/test/ndbapi/testSRBank ndb/test/ndbapi/testScan ndb/test/ndbapi/testScan.dsp ndb/test/ndbapi/testScanInterpreter |