diff options
| author | unknown <mskold@mysql.com> | 2005-04-13 14:08:54 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-04-13 14:08:54 +0200 |
| commit | f53284f1933d721e3f2a583c2849d9c1b2e2b740 (patch) | |
| tree | 7ce2ee6742021279194d934120d0ce652544fd24 /ndb | |
| parent | dec90f5b36f3977849009031fcd6b1891c08a884 (diff) | |
| parent | 9faf085b9f831e8bb77ba106d8561b0b0baafdc6 (diff) | |
| download | mariadb-git-f53284f1933d721e3f2a583c2849d9c1b2e2b740.tar.gz | |
Merge
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/Ndb.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp index 6390a1b50b5..9d520d5eac9 100644 --- a/ndb/src/ndbapi/Ndb.cpp +++ b/ndb/src/ndbapi/Ndb.cpp @@ -727,7 +727,7 @@ Ndb::getAutoIncrementValue(const char* aTableName, Uint32 cacheSize) Ndb_local_table_info *info= theDictionary->get_local_table_info(internalTableName, false); if (info == 0) - DBUG_RETURN(~0); + DBUG_RETURN(~(Uint64)0); const NdbTableImpl *table= info->m_table_impl; Uint64 tupleId = getTupleIdFromNdb(table->m_tableId, cacheSize); DBUG_PRINT("info", ("value %u", tupleId)); @@ -739,7 +739,7 @@ Ndb::getAutoIncrementValue(const NdbDictionary::Table * aTable, Uint32 cacheSize { DBUG_ENTER("getAutoIncrementValue"); if (aTable == 0) - DBUG_RETURN(~0); + DBUG_RETURN(~(Uint64)0); const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable); Uint64 tupleId = getTupleIdFromNdb(table->m_tableId, cacheSize); DBUG_PRINT("info", ("value %u", tupleId)); @@ -751,7 +751,7 @@ Ndb::getTupleIdFromNdb(const char* aTableName, Uint32 cacheSize) { const NdbTableImpl* table = theDictionary->getTable(aTableName); if (table == 0) - return ~0; + return ~(Uint64)0; return getTupleIdFromNdb(table->m_tableId, cacheSize); } @@ -780,7 +780,7 @@ Ndb::readAutoIncrementValue(const char* aTableName) const NdbTableImpl* table = theDictionary->getTable(aTableName); if (table == 0) { theError= theDictionary->getNdbError(); - DBUG_RETURN(~0); + DBUG_RETURN(~(Uint64)0); } Uint64 tupleId = readTupleIdFromNdb(table->m_tableId); DBUG_PRINT("info", ("value %u", tupleId)); @@ -792,7 +792,7 @@ Ndb::readAutoIncrementValue(const NdbDictionary::Table * aTable) { DBUG_ENTER("readtAutoIncrementValue"); if (aTable == 0) - DBUG_RETURN(~0); + DBUG_RETURN(~(Uint64)0); const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable); Uint64 tupleId = readTupleIdFromNdb(table->m_tableId); DBUG_PRINT("info", ("value %u", tupleId)); @@ -829,7 +829,7 @@ Ndb::setAutoIncrementValue(const NdbDictionary::Table * aTable, Uint64 val, bool { DEBUG_TRACE("setAutoIncrementValue " << val); if (aTable == 0) - return ~0; + return ~(Uint64)0; const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable); return setTupleIdInNdb(table->m_tableId, val, increase); } @@ -979,7 +979,7 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op) setDatabaseName(currentDb.c_str()); setDatabaseSchemaName(currentSchema.c_str()); - return ~0; + return ~(Uint64)0; } Uint32 |