Skip to content

Commit 7603463

Browse files
grooverdancvicentiu
authored andcommitted
Remove use of volatile in stored_field_cmp_to_item
This was added in c796415 but would hurt all other compilers because of Visual Studio. Hopefully this has been fixed now. Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>
1 parent b8d1398 commit 7603463

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

sql/item.cc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8924,15 +8924,10 @@ int stored_field_cmp_to_item(THD *thd, Field *field, Item *item)
89248924
}
89258925
return my_time_compare(&field_time, &item_time);
89268926
}
8927-
/*
8928-
The patch for Bug#13463415 started using this function for comparing
8929-
BIGINTs. That uncovered a bug in Visual Studio 32bit optimized mode.
8930-
Prefixing the auto variables with volatile fixes the problem....
8931-
*/
8932-
volatile double result= item->val_real();
8927+
double result= item->val_real();
89338928
if (item->null_value)
89348929
return 0;
8935-
volatile double field_result= field->val_real();
8930+
double field_result= field->val_real();
89368931
if (field_result < result)
89378932
return -1;
89388933
else if (field_result > result)

0 commit comments

Comments
 (0)