diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2005-09-20 12:07:18 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2005-09-20 12:07:18 +0200 |
| commit | 16328ca2159b40d88dc532e42c13e92499ee87e6 (patch) | |
| tree | 269ea1dcbe2a289a7ab7e027d734a87a24cfafa1 /ndb/include/ndbapi/NdbTransaction.hpp | |
| parent | 130e902cf1ed280fd2b3c635c080709a8fab7908 (diff) | |
| download | mariadb-git-16328ca2159b40d88dc532e42c13e92499ee87e6.tar.gz | |
ndb - post merge fixes
ndb/include/ndbapi/NdbTransaction.hpp:
post merge fixes
ndb/src/ndbapi/Ndblist.cpp:
post merge fixes
sql/ha_ndbcluster.cc:
post merge fixes
Diffstat (limited to 'ndb/include/ndbapi/NdbTransaction.hpp')
| -rw-r--r-- | ndb/include/ndbapi/NdbTransaction.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/include/ndbapi/NdbTransaction.hpp b/ndb/include/ndbapi/NdbTransaction.hpp index 4b12b0acbf3..a6ba6a11c4d 100644 --- a/ndb/include/ndbapi/NdbTransaction.hpp +++ b/ndb/include/ndbapi/NdbTransaction.hpp @@ -806,7 +806,7 @@ private: void define_scan_op(NdbIndexScanOperation*); friend class HugoOperations; - friend struct Ndb_free_list_t<NdbConnection>; + friend struct Ndb_free_list_t<NdbTransaction>; }; #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL |