From: Chuck Bell
Date: March 12 2009 1:40pm
Subject: bzr commit into mysql-6.0-backup branch (charles.bell:2799)
List-Archive: http://lists.mysql.com/commits/69038
Message-Id: <0KGE009KRBBED730@mail-amer.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7BIT

#At file:///C:/source/bzr/mysql-6.0-test-backup/ based on revid:charles.bell@stripped

 2799 Chuck Bell	2009-03-12
      Fixes valgrind warnings for the backup_logs test.
      
      Changes c_ptr() to c_ptr_safe() so that the end of
      string marker is properly set.
      modified:
        sql/set_var.cc

=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2009-03-09 14:00:03 +0000
+++ b/sql/set_var.cc	2009-03-12 13:40:28 +0000
@@ -2538,7 +2538,7 @@ static int  sys_check_log_path(THD *thd,
     return 1;
   }
 
-  log_file_str= res->c_ptr();
+  log_file_str= res->c_ptr_safe();
   bzero(&f_stat, sizeof(MY_STAT));
 
   path_length= unpack_filename(path, log_file_str);
@@ -2745,7 +2745,7 @@ static bool sys_update_backup_history_lo
   String str(buff,sizeof(buff), system_charset_info), *res;
 
   res= var->value->val_str(&str);
-  if (my_strcasecmp(system_charset_info, res->c_ptr(), 
+  if (my_strcasecmp(system_charset_info, res->c_ptr_safe(), 
       sys_var_backup_progress_log_path.value) == 0)
   {
     my_error(ER_BACKUP_LOGPATHS, MYF(0));
@@ -2773,7 +2773,7 @@ static bool sys_update_backup_progress_l
   String str(buff,sizeof(buff), system_charset_info), *res;
 
   res= var->value->val_str(&str);
-  if (my_strcasecmp(system_charset_info, res->c_ptr(), 
+  if (my_strcasecmp(system_charset_info, res->c_ptr_safe(), 
       sys_var_backup_history_log_path.value) == 0)
   {
     my_error(ER_BACKUP_LOGPATHS, MYF(0));