diff options
author | Sergey Vojtovich <svoj@sun.com> | 2009-09-10 11:58:13 +0500 |
---|---|---|
committer | Sergey Vojtovich <svoj@sun.com> | 2009-09-10 11:58:13 +0500 |
commit | 48ecd65c52f37ba970c0a7e4a74ce9c0f2a11375 (patch) | |
tree | 564fe9681266ab3518d0541a0f87ee06388fe68a /storage/archive | |
parent | eb7a3fc9cbd0ef7138cb72890fe8e196dd82d83c (diff) | |
parent | a7de20574749ececbe8492f340f6ddc7be1544fa (diff) | |
download | mariadb-git-48ecd65c52f37ba970c0a7e4a74ce9c0f2a11375.tar.gz |
Local merge.
Diffstat (limited to 'storage/archive')
-rw-r--r-- | storage/archive/ha_archive.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 49bf036c5a6..981814628f9 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -993,6 +993,7 @@ int ha_archive::rnd_init(bool scan) /* We rewind the file so that we can read from the beginning if scan */ if (scan) { + scan_rows= stats.records; DBUG_PRINT("info", ("archive will retrieve %llu rows", (unsigned long long) scan_rows)); @@ -1461,7 +1462,6 @@ int ha_archive::info(uint flag) stats.records= share->rows_recorded; pthread_mutex_unlock(&share->mutex); - scan_rows= stats.records; stats.deleted= 0; DBUG_PRINT("ha_archive", ("Stats rows is %d\n", (int)stats.records)); |