Commit a3380233 authored by Ramil Kalimullin's avatar Ramil Kalimullin

Auto-merge from mysql-5.1.

parents d0ed9f43 289af257
......@@ -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));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment