diff options
| author | unknown <joreland@mysql.com> | 2005-01-19 07:37:42 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-19 07:37:42 +0100 |
| commit | 7cbe4d19e4f152fcb5c7b0e2cb3da116132b8aef (patch) | |
| tree | f254fa19624bbd4b2781b2a8bf2cf8433c04a84e /ndb/src/ndbapi | |
| parent | 0eb1a8107f2b245b6bbcdc78d0a49a78996df3c9 (diff) | |
| parent | bfe74e69903583f1bb9b4ad803c137d6487afa74 (diff) | |
| download | mariadb-git-7cbe4d19e4f152fcb5c7b0e2cb3da116132b8aef.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi')
| -rw-r--r-- | ndb/src/ndbapi/NdbDictionaryImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp index 2a9f9be5a30..1ae4263545e 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -631,7 +631,7 @@ NdbEventImpl::addTableEvent(const NdbDictionary::Event::TableEvent t = NdbDicti } void -NdbEventImpl::setDurability(const NdbDictionary::Event::EventDurability d) +NdbEventImpl::setDurability(NdbDictionary::Event::EventDurability d) { m_dur = d; } @@ -1370,7 +1370,7 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret, } Uint32 topBit = (1 << 31); - for(int i = 31; i>=0; i--){ + for(i = 31; i>=0; i--){ if((fragCount & topBit) != 0) break; topBit >>= 1; |