← Back to team overview

maria-developers team mailing list archive

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2795)

 

#At lp:maria based on revid:knielsen@xxxxxxxxxxxxxxx-20100112081948-vn0oynh45l2wol9q

 2795 Michael Widenius	2010-01-12 [merge]
      Merge with 5.1
      modified:
        client/mysqlbinlog.cc

=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2009-12-03 11:19:05 +0000
+++ b/client/mysqlbinlog.cc	2010-01-09 09:04:51 +0000
@@ -1378,6 +1378,10 @@ static int parse_args(int *argc, char***
 */
 static Exit_status safe_connect()
 {
+  /* Close and old connections to MySQL */
+  if (mysql)
+    mysql_close(mysql);
+
   mysql= mysql_init(NULL);
 
   if (!mysql)