5.5 merge

This commit is contained in:
Sergei Golubchik 2013-07-17 21:24:29 +02:00
commit 97e640b9ae
1704 changed files with 7800 additions and 3313 deletions

View file

@ -1407,7 +1407,10 @@ int ha_archive::optimize(THD* thd, HA_CHECK_OPT* check_opt)
mysql_mutex_lock(&share->mutex);
if (init_archive_reader())
{
mysql_mutex_unlock(&share->mutex);
DBUG_RETURN(errno);
}
// now we close both our writer and our reader for the rename
if (share->archive_write_open)