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 | d49dfff7a2e00a75061ec879f5d5cfc8fee8dc9e (patch) | |
| tree | f78ef8fd4043b73f79e883d70cf2bd1aa00353f8 /.bzrignore | |
| parent | e1180711a2ec2c7a06a8a6d7b630061eda19ae8d (diff) | |
| parent | 287af8f43610f33fa49d2622b9a83f8a44afcbd2 (diff) | |
| download | mariadb-git-d49dfff7a2e00a75061ec879f5d5cfc8fee8dc9e.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 |