10.0-base merge

(without InnoDB - all InnoDB changes were ignored)
This commit is contained in:
Sergei Golubchik 2013-06-06 21:32:29 +02:00
commit 72ba95873a
464 changed files with 8657 additions and 2905 deletions

View file

@ -6355,8 +6355,7 @@ void do_delimiter(struct st_command* command)
if (!(*p))
die("Can't set empty delimiter");
strmake(delimiter, p, sizeof(delimiter) - 1);
delimiter_length= strlen(delimiter);
delimiter_length= strmake_buf(delimiter, p) - delimiter;
DBUG_PRINT("exit", ("delimiter: %s", delimiter));
command->last_argument= p + delimiter_length;