maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Michael Widenius (monty)
------------------------------------------------------------
revno: 2795 [merge]
committer: Michael Widenius <monty@xxxxxxxxxxxx>
branch nick: maria-5.1-merge
timestamp: Tue 2010-01-12 12:28:53 +0200
message:
  Merge with 5.1
modified:
  client/mysqlbinlog.cc


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

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