1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge of patch for bug#14685362 from mysql-5.1.

Browse Source
This commit is contained in:
Nirbhay Choubey 2013-03-18 12:46:06 +05:30
commit fb401ad38e
2 changed files with 20 additions and 2 deletions
Show Stats 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. 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;
}

2
sql-common/client.c
View File

@ -2215,6 +2215,8 @@ mysql_autodetect_character_set(MYSQL *mysql)
}
#endif
if (mysql->options.charset_name)
my_free(mysql->options.charset_name);
if (!(mysql->options.charset_name= my_strdup(csname, MYF(MY_WME))))
return 1;
return 0;