Merge mysql.com:/misc/mysql/31752_/41-31752_

into  mysql.com:/misc/mysql/31752_/50-31752_


client/mysqltest.c:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index b2b579528ae..f40aec2a40e 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -3581,7 +3581,7 @@ void do_get_file_name(struct st_command *command,
   if (*p)
     *p++= 0;
   command->last_argument= p;
-  strmake(dest, name, dest_max_len);
+  strmake(dest, name, dest_max_len - 1);
 }
 
 
@@ -6891,7 +6891,7 @@ int main(int argc, char **argv)
 
 	if (save_file[0])
 	{
-	  strmake(command->require_file, save_file, sizeof(save_file));
+	  strmake(command->require_file, save_file, sizeof(save_file) - 1);
 	  save_file[0]= 0;
 	}
 	run_query(cur_con, command, flags);