diff options
| author | unknown <joreland@mysql.com> | 2004-11-19 13:24:37 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-19 13:24:37 +0100 |
| commit | 0ce812d684c30b69f19807626d1cc35ef2d76d0f (patch) | |
| tree | 753ef0ffd31852563373ea9a830754a1fb78ce70 /ndb/src/ndbapi/NdbConnection.cpp | |
| parent | c175b8c7b2d6f9dffdb31c85f15a0e4bde97502d (diff) | |
| parent | 018cac958838511ae0fbed9441aa08c16bd3bd8c (diff) | |
| download | mariadb-git-0ce812d684c30b69f19807626d1cc35ef2d76d0f.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/NdbConnection.cpp')
| -rw-r--r-- | ndb/src/ndbapi/NdbConnection.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp index 8cf7c46deee..426b2c55d9f 100644 --- a/ndb/src/ndbapi/NdbConnection.cpp +++ b/ndb/src/ndbapi/NdbConnection.cpp @@ -1581,9 +1581,6 @@ from other transactions. /** * There's always a TCKEYCONF when using IgnoreError */ -#ifdef VM_TRACE - ndbout_c("Not completing transaction 2"); -#endif return -1; } /**********************************************************************/ @@ -1835,9 +1832,6 @@ NdbConnection::OpCompleteFailure(Uint8 abortOption, bool setFailure) /** * There's always a TCKEYCONF when using IgnoreError */ -#ifdef VM_TRACE - ndbout_c("Not completing transaction"); -#endif return -1; } |