diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-08-20 12:33:52 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-08-20 12:33:52 +0400 |
| commit | 33d29688d8011bec5108c925434acee1d66323a2 (patch) | |
| tree | ed397e55e243f4143c25e8f3678ca51738117110 /ndb | |
| parent | 83e6ea37be8b25cdfe34dc6aa198e780ecab1057 (diff) | |
| parent | 25a453493b38a5d5ff3bbe001ee2119a6c3da11a (diff) | |
| download | mariadb-git-33d29688d8011bec5108c925434acee1d66323a2.tar.gz | |
Resolving merging conflict
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/mgmapi/Makefile.am | 3 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbScanOperation.cpp | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/ndb/src/mgmapi/Makefile.am b/ndb/src/mgmapi/Makefile.am index 674debf5cc3..0f0e1cea5d8 100644 --- a/ndb/src/mgmapi/Makefile.am +++ b/ndb/src/mgmapi/Makefile.am @@ -10,9 +10,6 @@ include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am #ndbtest_PROGRAMS = ndb_test_mgmapi -#ndb_test_mgmapi_SOURCES = test_mgmapi.cpp -#ndb_test_mgmapi_LDFLAGS = @ndb_bin_am_ldflags@ -# $(top_builddir)/ndb/src/libndbclient.la # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index 7d51974da7c..428c6c8ebc8 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -661,8 +661,6 @@ NdbScanOperation::doSend(int ProcessorId) void NdbScanOperation::closeScan() { - int self = pthread_self() ; - if(m_transConnection) do { if(DEBUG_NEXT_RESULT) ndbout_c("closeScan() theError.code = %d " |