1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ndb: remove compiler warnings

Browse Source
This commit is contained in:
tomas@poseidon. 2006-12-27 14:16:34 +01:00
parent 044c410968
commit 7b9a5f6de2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/ha_ndbcluster.cc
View File

@ -7337,7 +7337,7 @@ static void print_share(const char* where, NDB_SHARE* share)
fprintf(DBUG_FILE, fprintf(DBUG_FILE,
"%s %s.%s: use_count: %u, commit_count: %llu\n", "%s %s.%s: use_count: %u, commit_count: %llu\n",
where, share->db, share->table_name, share->use_count, where, share->db, share->table_name, share->use_count,
share->commit_count); (long long unsigned int) share->commit_count);
fprintf(DBUG_FILE, fprintf(DBUG_FILE,
" - key: %s, key_length: %d\n", " - key: %s, key_length: %d\n",
share->key, share->key_length); share->key, share->key_length);

2
storage/ndb/src/kernel/blocks/backup/Backup.cpp
View File

@ -3948,7 +3948,7 @@ Backup::checkScan(Signal* signal, BackupFilePtr filePtr)
filePtr.p->tableId >= 2 && filePtr.p->tableId >= 2 &&
filePtr.p->operation.noOfRecords > 0) 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->tableId,
filePtr.p->fragmentNo, filePtr.p->fragmentNo,
filePtr.p->operation.noOfRecords); filePtr.p->operation.noOfRecords);

12
storage/ndb/src/mgmapi/mgmapi.cpp
View File

@ -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[5], Int, Mandatory, ""),
MGM_ARG(clusterlog_severity_names[6], Int, Mandatory, ""), MGM_ARG(clusterlog_severity_names[6], Int, Mandatory, ""),
}; };
CHECK_HANDLE(handle, NULL); CHECK_HANDLE(handle, -1);
CHECK_CONNECTED(handle, NULL); CHECK_CONNECTED(handle, -1);
Properties args; Properties args;
const Properties *reply; const Properties *reply;
reply = ndb_mgm_call(handle, getinfo_reply, "get info clusterlog", &args); 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++) { for(unsigned int i=0; i < severity_size; i++) {
reply->get(clusterlog_severity_names[severity[i].category], &severity[i].value); 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[10], Int, Mandatory, ""),
MGM_ARG(clusterlog_names[11], Int, Mandatory, ""), MGM_ARG(clusterlog_names[11], Int, Mandatory, ""),
}; };
CHECK_HANDLE(handle, NULL); CHECK_HANDLE(handle, -1);
CHECK_CONNECTED(handle, NULL); CHECK_CONNECTED(handle, -1);
Properties args; Properties args;
const Properties *reply; const Properties *reply;
reply = ndb_mgm_call(handle, getloglevel_reply, "get cluster loglevel", &args); 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++) { for(int i=0; i < loglevel_count; i++) {
reply->get(clusterlog_names[loglevel[i].category], &loglevel[i].value); reply->get(clusterlog_names[loglevel[i].category], &loglevel[i].value);