List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:May 30 2011 7:00am
Subject:bzr push into mysql-trunk branch (tor.didriksen:3125 to 3126) Bug#11765003
View as plain text  
 3126 Tor Didriksen	2011-05-30
      Bug#11765003 - 57912 Use memset() rather than the deprecated bfill() and bzero()
      Post push fix: a typo broke valgrind builds.

    modified:
      sql/opt_range.cc
 3125 Alfranio Correia	2011-05-30 [merge]
      merge mysql-trunk (local) --> mysql-trunk

    modified:
      mysql-test/extra/binlog_tests/binlog_cache_stat.test
      mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
      mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result
      mysql-test/suite/binlog/r/binlog_row_cache_stat.result
      mysql-test/suite/binlog/r/binlog_stm_cache_stat.result
      mysql-test/suite/rpl/r/rpl_crash_safe_master.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/t/rpl_crash_safe_master.test
      sql/binlog.cc
      sql/binlog.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/rpl_injector.cc
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_parse.cc
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2011-05-26 15:20:09 +0000
+++ b/sql/opt_range.cc	2011-05-30 07:00:39 +0000
@@ -9045,7 +9045,7 @@ int QUICK_RANGE_SELECT::reset()
       (Now ndb stores  complete row in here, instead of only the used fields
       which gives us valgrind warnings in compare_record[])
     */
-    memset(mrange_buff, 0, mrange_bufsiz);
+    memset(mrange_buff, 0, buf_size);
 #endif
   }
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3125 to 3126) Bug#11765003Tor Didriksen31 May