bk commit into 6.0 tree (chris:1.2652) BUG#22125

[cpowers]

Below is the list of changes that have just been committed into a local
6.0 repository of cpowers. When cpowers does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-26 00:15:02-05:00, chris@stripped +4 -0
  Bug#22125 "Falcon: Double precision searches fail if index exists"
  
  Force DOUBLE values of -0 to 0.

  mysql-test/suite/falcon/r/falcon_bug_22125.result@stripped, 2007-10-26 00:15:00-05:00,
chris@stripped +2 -2
    Changed -0 DOUBLEs to 0

  mysql-test/suite/falcon/t/disabled.def@stripped, 2007-10-26 00:15:00-05:00,
chris@stripped +0 -1
    Enabled 22125

  storage/falcon/EncodedDataStream.cpp@stripped, 2007-10-26 00:15:00-05:00,
chris@stripped +4 -1
    Force DOUBLE -0 to 0

  storage/falcon/Value.cpp@stripped, 2007-10-26 00:15:00-05:00, chris@stripped +1 -1
    Force DOUBLE -0 to 0

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22125.result
b/mysql-test/suite/falcon/r/falcon_bug_22125.result
--- a/mysql-test/suite/falcon/r/falcon_bug_22125.result	2007-09-20 10:42:55 -05:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_22125.result	2007-10-26 00:15:00 -05:00
@@ -28,9 +28,9 @@ SELECT * FROM t1 ORDER BY f1,f2,f3,f4;
 f1	f2	f3	f4
 -1.79769313486232e+308	-inf	0	-6
 -1.79769313486232e+308	-max	0	-3
--1.79769313486232e+308	-nan	-0	-5
+-1.79769313486232e+308	-nan	0	-5
 -5.562684646268e-309	-min	0	-4
--0	-zero	0	-1
+0	-zero	0	-1
 0	zero	0	1
 5.562684646268e-309	min	0	4
 1.79769313486232e+308	inf	0	6
diff -Nrup a/mysql-test/suite/falcon/t/disabled.def
b/mysql-test/suite/falcon/t/disabled.def
--- a/mysql-test/suite/falcon/t/disabled.def	2007-10-24 02:01:10 -05:00
+++ b/mysql-test/suite/falcon/t/disabled.def	2007-10-26 00:15:00 -05:00
@@ -23,7 +23,6 @@ falcon_bug_22173    : Bug#22173 2006-08-
 falcon_bug_22182    : Disabled until runtime team provides RENAME DATABASE replacement.
See WL#4030
 falcon_bug_22187    : Bug#22187 2006-08-24 hakank (Get pushbuild green)
 falcon_bug_22189    : Bug#22189 2006-08-24 hakank (Get pushbuild green)
-falcon_bug_22125    : Bug#22125 2006-09-13 hakank (Get pushbuild green)
 falcon_bug_22564    : Bug#22564 2006-10-07 hakank (Get pushbuild green)
 falcon_bug_22845    : Bug#22845 2006-10-07 hakank Currently hangs
 falcon_bug_23692    : Bug#23692 2006-10-27 hakank Currently failing
diff -Nrup a/storage/falcon/EncodedDataStream.cpp b/storage/falcon/EncodedDataStream.cpp
--- a/storage/falcon/EncodedDataStream.cpp	2007-09-20 10:41:39 -05:00
+++ b/storage/falcon/EncodedDataStream.cpp	2007-10-26 00:15:00 -05:00
@@ -1258,7 +1258,10 @@ void EncodedDataStream::encodeDouble(dou
 		double d;
 		} u;
 
-	u.d = dbl;
+	// Convert negative 0 to 0
+		
+	u.d = (dbl == 0 ? 0 : dbl);
+		
 	int count = 0;
 
 	while (count < 8 && u.chars[count] == 0)
diff -Nrup a/storage/falcon/Value.cpp b/storage/falcon/Value.cpp
--- a/storage/falcon/Value.cpp	2007-10-24 01:58:22 -05:00
+++ b/storage/falcon/Value.cpp	2007-10-26 00:15:00 -05:00
@@ -561,7 +561,7 @@ void Value::setValue(double value)
 {
 	clear();
 	type = Double;
-	data.dbl = value;
+	data.dbl = (value == 0 ? 0 : value);
 	scale = 0;
 }