diff options
| author | unknown <mskold@mysql.com> | 2004-09-11 20:56:06 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-09-11 20:56:06 +0200 |
| commit | 173b1be72da9c0cd1eed1be7738b3efffe940e17 (patch) | |
| tree | 4ec18c131658741e369ea454678e1211b484effd /ndb/src/ndbapi/Ndb.cpp | |
| parent | dffba0713f03575e996a75d5da0fb156c4f0e1dc (diff) | |
| parent | da6dd3fad9c4ed2d9a1dd9232fe03844500a6778 (diff) | |
| download | mariadb-git-173b1be72da9c0cd1eed1be7738b3efffe940e17.tar.gz | |
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/Ndb.cpp')
| -rw-r--r-- | ndb/src/ndbapi/Ndb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp index d5f9ef1a51b..9e45132b835 100644 --- a/ndb/src/ndbapi/Ndb.cpp +++ b/ndb/src/ndbapi/Ndb.cpp @@ -1141,7 +1141,7 @@ void Ndb::setCatalogName(const char * a_catalog_name) int len = snprintf(prefixName, sizeof(prefixName), "%s%c%s%c", theDataBase, table_name_separator, theDataBaseSchema, table_name_separator); - prefixEnd = prefixName + (len < sizeof(prefixName) ? len : + prefixEnd = prefixName + (len < (int) sizeof(prefixName) ? len : sizeof(prefixName) - 1); } } @@ -1160,7 +1160,7 @@ void Ndb::setSchemaName(const char * a_schema_name) int len = snprintf(prefixName, sizeof(prefixName), "%s%c%s%c", theDataBase, table_name_separator, theDataBaseSchema, table_name_separator); - prefixEnd = prefixName + (len < sizeof(prefixName) ? len : + prefixEnd = prefixName + (len < (int) sizeof(prefixName) ? len : sizeof(prefixName) - 1); } } |