From: sayantan.dutta
Date: December 12 2012 9:47am
Subject: bzr push into mysql-5.5 branch (sayantan.dutta:4107 to 4108)
List-Archive: http://lists.mysql.com/commits/145491
Message-Id: <201212120947.qBC9lttl009145@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4108 sayantan.dutta@stripped	2012-12-12 [merge]
      upmerge 14737171 5.1=>5.5

    modified:
      mysql-test/mysql-test-run.pl
 4107 Dmitry Lenev	2012-12-11 [merge]
      Bug #15954872 "MAKE MDL SUBSYSTEM AND TABLE DEFINITION CACHE
      ROBUST AGAINST BUGS IN CALLERS".
      
      Both MDL subsystems and Table Definition Cache code assume
      that callers ensure that names of objects passed to them are
      not longer than NAME_LEN bytes. Unfortunately due to bugs in
      callers this assumption might be broken in some cases. As
      result we get nasty bugs causing buffer overruns when we
      construct MDL key or TDC key from object names.
      
      This patch makes MDL and TDC code more robust against such
      bugs by ensuring that we always checking size of result
      buffer when constructing MDL and TDC keys. This doesn't
      free its callers from ensuring that both db and table names
      are shorter than NAME_LEN bytes. But at least these steps
      prevents buffer overruns in case of bug in caller, replacing
      them with less harmful behavior.
      
      This is 5.5-only version of patch.
      
      Changed code of MDL_key::mdl_key_init() to take into account
      size of buffer for the key.
      
      Introduced new version of create_table_def_key() helper function
      which constructs TDC key without risk of result buffer overrun.
      Places in code that construct TDC keys were changed to use this
      function.
      
      Also changed rm_temporary_table() and open_new_frm() functions
      to avoid use of "unsafe" strmov() and strxmov() functions and
      use safer strnxmov() instead.

    modified:
      sql/mdl.h
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_cache.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-12-11 13:05:52 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-12-12 09:40:47 +0000
@@ -696,7 +696,9 @@ sub run_test_server ($$$) {
 	    else {
 	      mtr_report("\nRetrying test $tname, ".
 			 "attempt($retries/$opt_retry)...\n");
-              my $log_file_name= $opt_vardir."/log/".$result->{shortname}.".log";
+              #saving the log file as filename.failed in case of retry
+              my $worker_logdir= $result->{savedir};
+              my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log";
               rename $log_file_name,$log_file_name.".failed";
 	      delete($result->{result});
 	      $result->{retries}= $retries+1;

No bundle (reason: useless for push emails).