#At file:///home/spetrunia/dev/mysql-6.0-opt-merge3/ based on revid:sergefp@stripped
2691 Sergey Petrunia 2009-02-04
BUG#42534: subselect3_jcl6 produces valgrind warnings with MTR2
- Make JOIN_CACHE::reset() set last_rec_pos to point to the first record in the buffer, not
to the byte right before the buffer.
modified:
mysql-test/t/disabled.def
sql/sql_join_cache.cc
per-file messages:
mysql-test/t/disabled.def
Enable back subselect3_jcl6.test
sql/sql_join_cache.cc
BUG#42534: subselect3_jcl6 produces valgrind warnings with MTR2
- Make JOIN_CACHE::reset() set last_rec_pos to point to the first record in the buffer, not
to the byte right before the buffer.
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2009-02-02 09:02:40 +0000
+++ b/mysql-test/t/disabled.def 2009-02-03 23:03:17 +0000
@@ -39,4 +39,3 @@ user_limits : Bug#
;kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
query_cache_28249 : Bug#41098 Query Cache returns wrong result with concurrent insert
innodb_bug39438 : BUG#42383 2009-01-28 lsoares "This fails in embedded and on windows. Note that this test is not run on windows and on embedded in PB for main trees currently"
-subselect3_jcl6 : BUG#42534 subselect3_jcl6 produces valgrind warnings with MTR2 (2008-02-02 spetrunia)
=== modified file 'sql/sql_join_cache.cc'
--- a/sql/sql_join_cache.cc 2009-01-26 15:07:22 +0000
+++ b/sql/sql_join_cache.cc 2009-02-03 23:03:17 +0000
@@ -1149,7 +1149,7 @@ void JOIN_CACHE::reset(bool for_writing)
if (for_writing)
{
records= 0;
- last_rec_pos= buff-1;
+ last_rec_pos= buff;
aux_buff_size= 0;
end_pos= pos;
last_rec_blob_data_is_in_rec_buff= 0;
| Thread |
|---|
| • bzr commit into mysql-6.0-opt branch (sergefp:2691) Bug#42534 | Sergey Petrunia | 4 Feb |