Commit 5b5e0da0 authored by unknown's avatar unknown

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

into  mysql.com:/misc/mysql/32770/50-32770

parents 966aef3d a4c45612
...@@ -3592,7 +3592,7 @@ void do_get_file_name(struct st_command *command, ...@@ -3592,7 +3592,7 @@ void do_get_file_name(struct st_command *command,
if (*p) if (*p)
*p++= 0; *p++= 0;
command->last_argument= p; command->last_argument= p;
strmake(dest, name, dest_max_len); strmake(dest, name, dest_max_len - 1);
} }
...@@ -6908,7 +6908,7 @@ int main(int argc, char **argv) ...@@ -6908,7 +6908,7 @@ int main(int argc, char **argv)
if (save_file[0]) 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; save_file[0]= 0;
} }
run_query(cur_con, command, flags); run_query(cur_con, command, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment