database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mysql-5.5.32 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-07-16 19:09:54 +02:00
parent b9f220b45a 4f5c10e6b5
commit 005c7e5421
1489 changed files with 3085 additions and 1941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/mysql.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 2000, 2012, Oracle and/or its affiliates.
Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2009, 2013, Monty Program Ab.
This program is free software; you can redistribute it and/or modify
@ -1923,7 +1923,7 @@ static int read_and_execute(bool interactive)
String buffer;
#endif
char *line= 0;
char *line= NULL;
char in_string=0;
ulong line_number=0;
bool ml_comment= 0;
@ -2022,6 +2022,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__) */
@ -2081,6 +2088,14 @@ 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
/*
@ -2089,6 +2104,7 @@ static int read_and_execute(bool interactive)
program, it is safe to set real_binary_mode to FALSE.
*/
real_binary_mode= FALSE;
return status.exit_status;
}