diff options
| author | unknown <tomas@poseidon.> | 2006-12-27 14:16:34 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.> | 2006-12-27 14:16:34 +0100 |
| commit | 0968cc9dec13ddc3352eeff73aa8ebb3eecb0213 (patch) | |
| tree | df29d7cb0879b8d7b1a8dbb00d360d1a1e4ab082 | |
| parent | e5dd5e063a2b291b0169e1efb3be05dcaef36fc7 (diff) | |
| download | mariadb-git-0968cc9dec13ddc3352eeff73aa8ebb3eecb0213.tar.gz | |
ndb: remove compiler warnings
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 | ||||
| -rw-r--r-- | storage/ndb/src/kernel/blocks/backup/Backup.cpp | 2 | ||||
| -rw-r--r-- | storage/ndb/src/mgmapi/mgmapi.cpp | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index ef9a4e5720a..5614cc3ecd8 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -7337,7 +7337,7 @@ static void print_share(const char* where, NDB_SHARE* share) fprintf(DBUG_FILE, "%s %s.%s: use_count: %u, commit_count: %llu\n", where, share->db, share->table_name, share->use_count, - share->commit_count); + (long long unsigned int) share->commit_count); fprintf(DBUG_FILE, " - key: %s, key_length: %d\n", share->key, share->key_length); diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp index aae64b4bb6c..a07617f0bfb 100644 --- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp +++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp @@ -3948,7 +3948,7 @@ Backup::checkScan(Signal* signal, BackupFilePtr filePtr) filePtr.p->tableId >= 2 && filePtr.p->operation.noOfRecords > 0) { - ndbout_c("halting backup for table %d fragment: %d after %d records", + ndbout_c("halting backup for table %d fragment: %d after %llu records", filePtr.p->tableId, filePtr.p->fragmentNo, filePtr.p->operation.noOfRecords); diff --git a/storage/ndb/src/mgmapi/mgmapi.cpp b/storage/ndb/src/mgmapi/mgmapi.cpp index e7990ad678f..bd58425c802 100644 --- a/storage/ndb/src/mgmapi/mgmapi.cpp +++ b/storage/ndb/src/mgmapi/mgmapi.cpp @@ -1273,13 +1273,13 @@ ndb_mgm_get_clusterlog_severity_filter(NdbMgmHandle handle, MGM_ARG(clusterlog_severity_names[5], Int, Mandatory, ""), MGM_ARG(clusterlog_severity_names[6], Int, Mandatory, ""), }; - CHECK_HANDLE(handle, NULL); - CHECK_CONNECTED(handle, NULL); + CHECK_HANDLE(handle, -1); + CHECK_CONNECTED(handle, -1); Properties args; const Properties *reply; reply = ndb_mgm_call(handle, getinfo_reply, "get info clusterlog", &args); - CHECK_REPLY(reply, NULL); + CHECK_REPLY(reply, -1); for(unsigned int i=0; i < severity_size; i++) { reply->get(clusterlog_severity_names[severity[i].category], &severity[i].value); @@ -1430,13 +1430,13 @@ ndb_mgm_get_clusterlog_loglevel(NdbMgmHandle handle, MGM_ARG(clusterlog_names[10], Int, Mandatory, ""), MGM_ARG(clusterlog_names[11], Int, Mandatory, ""), }; - CHECK_HANDLE(handle, NULL); - CHECK_CONNECTED(handle, NULL); + CHECK_HANDLE(handle, -1); + CHECK_CONNECTED(handle, -1); Properties args; const Properties *reply; reply = ndb_mgm_call(handle, getloglevel_reply, "get cluster loglevel", &args); - CHECK_REPLY(reply, NULL); + CHECK_REPLY(reply, -1); for(int i=0; i < loglevel_count; i++) { reply->get(clusterlog_names[loglevel[i].category], &loglevel[i].value); |