Auto-merge from mysql-5.1.

a3380233 · Ramil Kalimullin · d0ed9f43 · 289af257 · a3380233
Commit a3380233 authored Dec 23, 2011 by Ramil Kalimullin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

storage/federated/ha_federated.cc storage/federated/ha_federated.cc +2 -1

No files found.
--- 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));
 }