mirror of
https://github.com/MariaDB/server.git
synced 2025-07-05 12:42:17 +03:00
Merge of patch for bug#14685362 from mysql-5.1.
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
/*
|
||||
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -1849,7 +1849,7 @@ static int read_and_execute(bool interactive)
|
||||
String buffer;
|
||||
#endif
|
||||
|
||||
char *line;
|
||||
char *line= NULL;
|
||||
char in_string=0;
|
||||
ulong line_number=0;
|
||||
bool ml_comment= 0;
|
||||
@ -1913,6 +1913,13 @@ static int read_and_execute(bool interactive)
|
||||
#else
|
||||
if (opt_outfile)
|
||||
fputs(prompt, OUTFILE);
|
||||
/*
|
||||
free the previous entered line.
|
||||
Note: my_free() cannot be used here as the memory was allocated under
|
||||
the readline/libedit library.
|
||||
*/
|
||||
if (line)
|
||||
free(line);
|
||||
line= readline(prompt);
|
||||
#endif /* defined(__WIN__) */
|
||||
|
||||
@ -1970,8 +1977,17 @@ static int read_and_execute(bool interactive)
|
||||
#if defined(__WIN__)
|
||||
buffer.free();
|
||||
tmpbuf.free();
|
||||
#else
|
||||
if (interactive)
|
||||
/*
|
||||
free the last entered line.
|
||||
Note: my_free() cannot be used here as the memory was allocated under
|
||||
the readline/libedit library.
|
||||
*/
|
||||
free(line);
|
||||
#endif
|
||||
|
||||
|
||||
return status.exit_status;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user