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

Nirbhay Choubey · Nirbhay Choubey · commit fb401ad38e22 · 2013-03-18T12:46:06.000+05:30
diff --git a/client/mysql.cc b/client/mysql.cc
@@ -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;
 }
 
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -2215,6 +2215,8 @@ mysql_autodetect_character_set(MYSQL *mysql)`
`2215`	`2215`	`}`
`2216`	`2216`	`#endif`
`2217`	`2217`
	`2218`	`+ if (mysql->options.charset_name)`
	`2219`	`+ my_free(mysql->options.charset_name);`
`2218`	`2220`	`if (!(mysql->options.charset_name= my_strdup(csname, MYF(MY_WME))))`
`2219`	`2221`	`return 1;`
`2220`	`2222`	`return 0;`