summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorunknown <tnurnberg@white.intern.koehntopp.de>2007-12-17 12:10:26 +0100
committerunknown <tnurnberg@white.intern.koehntopp.de>2007-12-17 12:10:26 +0100
commite5b3254e70db3004a2b7a7c2ef462ffebe802d33 (patch)
treefb76413ccc1e937dfed1a80259d86219a483a97d /client/mysqltest.c
parent02cdb7eccab6fe262d4a9d430f9d23eb51ac4839 (diff)
parent9295bc34656b8219b3e6c37ba007184be165e559 (diff)
downloadmariadb-git-e5b3254e70db3004a2b7a7c2ef462ffebe802d33.tar.gz
Merge mysql.com:/misc/mysql/31752_/41-31752_
into mysql.com:/misc/mysql/31752_/50-31752_ client/mysqltest.c: Auto merged
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c4
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);