diff options
| author | Daniel Black <daniel@linux.vnet.ibm.com> | 2017-11-16 20:32:33 +0800 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <cvicentiu@gmail.com> | 2017-12-05 12:09:43 +0200 |
| commit | 7603463a46b288c1b5630348e36c622e4c2abb09 (patch) | |
| tree | b4f3b3610673277b92e21debf52fec206612322e /sql | |
| parent | b8d1398b1d061566ada0714fb2407cdd45ff42b2 (diff) | |
| download | mariadb-git-7603463a46b288c1b5630348e36c622e4c2abb09.tar.gz | |
Remove use of volatile in stored_field_cmp_to_item
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>
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/item.cc b/sql/item.cc index 332e027adf1..574e8722c3d 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8924,15 +8924,10 @@ int stored_field_cmp_to_item(THD *thd, Field *field, Item *item) } return my_time_compare(&field_time, &item_time); } - /* - 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(); + double result= item->val_real(); if (item->null_value) return 0; - volatile double field_result= field->val_real(); + double field_result= field->val_real(); if (field_result < result) return -1; else if (field_result > result) |