diff options
Diffstat (limited to 'storage/federated/ha_federated.cc')
| -rw-r--r-- | storage/federated/ha_federated.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 6d3d665b9f1..ee44898f7bd 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, 2015, 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; @@ -2883,7 +2883,7 @@ int ha_federated::info(uint flag) } - if (flag & HA_STATUS_AUTO) + if ((flag & HA_STATUS_AUTO) && mysql) stats.auto_increment_value= mysql->insert_id; mysql_free_result(result); |