diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2011-12-23 18:56:29 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2011-12-23 18:56:29 +0400 |
| commit | a338023323a9d1c8b6c3d64f6bb2b97e0be04a09 (patch) | |
| tree | 8f7082a7f858fcadf1e4161934b314180e9e4938 /storage/federated | |
| parent | d0ed9f437c92a57ec6ae30a665a035e5e5a941e6 (diff) | |
| parent | 289af2579b5084d554b71a9307ec705afbba8ae7 (diff) | |
| download | mariadb-git-a338023323a9d1c8b6c3d64f6bb2b97e0be04a09.tar.gz | |
Auto-merge from mysql-5.1.
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index e762a1c3bee..e5421dc30ab 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -1692,7 +1692,8 @@ int ha_federated::close(void) if the original query was not issued against the FEDERATED table. So, don't propagate errors from mysql_close(). */ - table->in_use->clear_error(); + if (table->in_use) + table->in_use->clear_error(); DBUG_RETURN(free_share(share)); } |