mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42

Browse source
This commit is contained in:
Sergei Golubchik 2015-02-11 23:50:40 +01:00
commit 8e80f91fa3
54 changed files with 1214 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/federated/ha_federated.cc
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2004, 2013, Oracle and/or its affiliates.
/* Copyright (c) 2004, 2014, Oracle and/or its affiliates.
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
@ -1679,9 +1679,9 @@ int ha_federated::close(void)
DBUG_ENTER("ha_federated::close");
free_result();
delete_dynamic(&results);
/* Disconnect from mysql */
mysql_close(mysql);
mysql= NULL;