diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
| commit | 993ea79f2df42292eceeee394e8ece9f4a3f6cf2 (patch) | |
| tree | d105c8288a89a25d412e9006b740c756db6326d6 /storage/archive | |
| parent | 1827d9591e24ee469527021771088d842ab18374 (diff) | |
| parent | 6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d (diff) | |
| download | mariadb-git-993ea79f2df42292eceeee394e8ece9f4a3f6cf2.tar.gz | |
5.5 merge
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 5d6253a2a9f..8d418cb571c 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -907,10 +907,11 @@ int ha_archive::write_row(uchar *buf) ha_statistic_increment(&SSV::ha_write_count); mysql_mutex_lock(&share->mutex); - if (!share->archive_write_open) - if (init_archive_writer()) - DBUG_RETURN(errno); - + if (!share->archive_write_open && init_archive_writer()) + { + rc= errno; + goto error; + } if (table->next_number_field && record == table->record[0]) { @@ -990,7 +991,6 @@ int ha_archive::write_row(uchar *buf) error: mysql_mutex_unlock(&share->mutex); my_free(read_buf); - DBUG_RETURN(rc); } |