diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-09-14 09:12:47 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-09-14 09:12:47 +0500 |
| commit | 4fd663b896bbbc22ff5b1aba805e460dfcc3d4e6 (patch) | |
| tree | 675f76ed44e10cc3a6790ad57b049fdfa0401895 /ndb/include/ndbapi/NdbConnection.hpp | |
| parent | d2f7fe35584a75d5bc3a9a6950cc15d264e31241 (diff) | |
| parent | ec2512cf184c6746df48e2dfd5f493c3278e393a (diff) | |
| download | mariadb-git-4fd663b896bbbc22ff5b1aba805e460dfcc3d4e6.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b20471v2
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
Diffstat (limited to 'ndb/include/ndbapi/NdbConnection.hpp')
| -rw-r--r-- | ndb/include/ndbapi/NdbConnection.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ndb/include/ndbapi/NdbConnection.hpp b/ndb/include/ndbapi/NdbConnection.hpp index 75c3f80121d..c367e156f08 100644 --- a/ndb/include/ndbapi/NdbConnection.hpp +++ b/ndb/include/ndbapi/NdbConnection.hpp @@ -163,7 +163,8 @@ class NdbConnection friend class NdbIndexOperation; friend class NdbIndexScanOperation; friend class NdbBlob; - + friend class ha_ndbcluster; + public: /** @@ -675,6 +676,7 @@ private: // optim: any blobs bool theBlobFlag; Uint8 thePendingBlobOps; + inline bool hasBlobOperation() { return theBlobFlag; } static void sendTC_COMMIT_ACK(NdbApiSignal *, Uint32 transId1, Uint32 transId2, |