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

Remove use of volatile in stored_field_cmp_to_item

Browse Source 
This was added in c79641594348 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>
This commit is contained in:
Daniel Black 2017-11-16 20:32:33 +08:00 committed by Vicențiu-Marian Ciorbaru
parent b8d1398b1d
commit 7603463a46
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/item.cc
View File

@ -8924,15 +8924,10 @@ int stored_field_cmp_to_item(THD *thd, Field *field, Item *item)
} }
return my_time_compare(&field_time, &item_time); return my_time_compare(&field_time, &item_time);
} }
/* double result= item->val_real();
The patch for Bug#13463415 started using this function for comparing
BIGINTs. That uncovered a bug in Visual Studio 32bit optimized mode.
Prefixing the auto variables with volatile fixes the problem....
*/
volatile double result= item->val_real();
if (item->null_value) if (item->null_value)
return 0; return 0;
volatile double field_result= field->val_real(); double field_result= field->val_real();
if (field_result < result) if (field_result < result)
return -1; return -1;
else if (field_result > result) else if (field_result > result)