mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
This commit is contained in:
commit
d2b78a2825
1 changed files with 8 additions and 2 deletions
|
@ -393,10 +393,16 @@ int Arg_comparator::compare_e_binary_string()
|
|||
|
||||
int Arg_comparator::compare_real()
|
||||
{
|
||||
double val1= (*a)->val();
|
||||
/*
|
||||
Fix yet another manifestation of Bug#2338. 'Volatile' will instruct
|
||||
gcc to flush double values out of 80-bit Intel FPU registers before
|
||||
performing the comparison.
|
||||
*/
|
||||
volatile double val1, val2;
|
||||
val1= (*a)->val();
|
||||
if (!(*a)->null_value)
|
||||
{
|
||||
double val2= (*b)->val();
|
||||
val2= (*b)->val();
|
||||
if (!(*b)->null_value)
|
||||
{
|
||||
owner->null_value= 0;
|
||||
|
|
Loading…
Reference in a new issue