bzr commit into mysql-5.1-bugteam branch (epotemkin:3262) Bug#49489

[Evgeny Potemkin]

#At file:///work/bzrroot/mysql-5.1-bugteam/ based on revid:v.narayanan@stripped

 3262 Evgeny Potemkin	2009-12-11 [merge]
      Auto-merged fix for bug#49489.

    modified:
      mysql-test/r/select.result
      mysql-test/t/select.test
      sql/item_cmpfunc.cc
=== modified file 'mysql-test/r/select.result'
--- a/mysql-test/r/select.result	2009-12-10 06:31:52 +0000
+++ b/mysql-test/r/select.result	2009-12-11 13:08:29 +0000
@@ -4694,4 +4694,14 @@ HAVING v <= 't' 
 ORDER BY pk;
 v
 DROP TABLE t1;
+#
+# Bug#49489 Uninitialized cache led to a wrong result.
+#
+CREATE TABLE t1(c1 DOUBLE(5,4));
+INSERT INTO t1 VALUES (9.1234);
+SELECT * FROM t1 WHERE c1 < 9.12345;
+c1
+9.1234
+DROP TABLE t1;
+# End of test for bug#49489.
 End of 5.1 tests

=== modified file 'mysql-test/t/select.test'
--- a/mysql-test/t/select.test	2009-12-10 06:31:52 +0000
+++ b/mysql-test/t/select.test	2009-12-11 13:08:29 +0000
@@ -4014,4 +4014,13 @@ ORDER BY pk;
 
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#49489 Uninitialized cache led to a wrong result.
+--echo #
+CREATE TABLE t1(c1 DOUBLE(5,4));
+INSERT INTO t1 VALUES (9.1234);
+SELECT * FROM t1 WHERE c1 < 9.12345;
+DROP TABLE t1;
+--echo # End of test for bug#49489.
+
 --echo End of 5.1 tests

=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc	2009-12-10 07:03:23 +0000
+++ b/sql/item_cmpfunc.cc	2009-12-11 13:08:29 +0000
@@ -1031,7 +1031,7 @@ Item** Arg_comparator::cache_converted_c
       (*value)->const_item() && type != (*value)->result_type())
   {
     Item_cache *cache= Item_cache::get_cache(*value, type);
-    cache->store(*value);
+    cache->setup(*value);
     *cache_item= cache;
     return cache_item;
   }


Attachment: [text/bzr-bundle] bzr/[e-mail]