diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-07 13:21:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-03-07 13:21:02 +0100 |
| commit | 2db62f686e148f09fe5fd0b385fc71f2a3c4a133 (patch) | |
| tree | cf1d5d6f0d05f1b50be96d943476173228cbd458 /storage/federated | |
| parent | 143f5d9172647a43cdcf5c27b8a78f32c9f639c0 (diff) | |
| parent | d61573d3e5c8f9d85b88f9fa2e79160b159bf67d (diff) | |
| download | mariadb-git-2db62f686e148f09fe5fd0b385fc71f2a3c4a133.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 8670048e9a2..fc620245770 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -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 @@ -1665,9 +1665,9 @@ int ha_federated::close(void) DBUG_ENTER("ha_federated::close"); free_result(); - + delete_dynamic(&results); - + /* Disconnect from mysql */ mysql_close(mysql); mysql= NULL; |