Bug#32107056 SEVERAL COMPILE WARNINGS FOR MYSQL CLUSTER ON WINDOWS WITH VS 2019 [#3] [noclose]

zmur · zmur · commit e6ae6fe8d7ea · 2020-11-05T18:15:27.000+01:00
storage\ndb\src\common\portlib\NdbThread.cpp(1240,3): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation

Change-Id: I33e3ff9845f3d3e496f64401d30eaa9b992da594
diff --git a/storage/ndb/src/common/portlib/NdbThread.cpp b/storage/ndb/src/common/portlib/NdbThread.cpp
@@ -1221,7 +1221,7 @@ NdbThread_LockCPUSet(struct NdbThread* pThread,
   unsigned long long temp, stat, dynamic;
   unsigned long long num_cpu_ids = (unsigned long long)cpu_set_ptr[0];
   unsigned int *stat_part = &cpu_set_ptr[2 + num_processor_groups];
-  int found = FALSE;
+  bool found = false;
   for (unsigned int i = 0; i < num_processor_groups; i++)
   {
     stat = (unsigned long long)stat_part[i];
@@ -1233,11 +1233,11 @@ NdbThread_LockCPUSet(struct NdbThread* pThread,
       {
         used_processor_group = i;
         min_so_far = temp;
-        found = TRUE;
+        found = true;
       }
     }
   }
-  assert(found == TRUE);
+  assert(found);
   KAFFINITY mask;
   calculate_processor_mask(&mask,
                            used_processor_group,

Original file line number	Diff line number	Diff line change
`@@ -1221,7 +1221,7 @@ NdbThread_LockCPUSet(struct NdbThread* pThread,`
`1221`	`1221`	`unsigned long long temp, stat, dynamic;`
`1222`	`1222`	`unsigned long long num_cpu_ids = (unsigned long long)cpu_set_ptr[0];`
`1223`	`1223`	`unsigned int *stat_part = &cpu_set_ptr[2 + num_processor_groups];`
`1224`		`- int found = FALSE;`
	`1224`	`+ bool found = false;`
`1225`	`1225`	`for (unsigned int i = 0; i < num_processor_groups; i++)`
`1226`	`1226`	`{`
`1227`	`1227`	`stat = (unsigned long long)stat_part[i];`
`@@ -1233,11 +1233,11 @@ NdbThread_LockCPUSet(struct NdbThread* pThread,`
`1233`	`1233`	`{`
`1234`	`1234`	`used_processor_group = i;`
`1235`	`1235`	`min_so_far = temp;`
`1236`		`- found = TRUE;`
	`1236`	`+ found = true;`
`1237`	`1237`	`}`
`1238`	`1238`	`}`
`1239`	`1239`	`}`
`1240`		`- assert(found == TRUE);`
	`1240`	`+ assert(found);`
`1241`	`1241`	`KAFFINITY mask;`
`1242`	`1242`	`calculate_processor_mask(&mask,`
`1243`	`1243`	`used_processor_group,`