Commit e5cddec6 authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/space/pekka/ndb/version/my41

parents e12f1a44 f485db42
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -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;