Commit ed9fb84f authored by unknown's avatar unknown

Centralized init logic for starting a scan.


storage/archive/ha_archive.cc:
  Removed multiple execution logic
parent 6203c4e2
...@@ -923,7 +923,7 @@ int ha_archive::index_read(byte *buf, const byte *key, ...@@ -923,7 +923,7 @@ int ha_archive::index_read(byte *buf, const byte *key,
int ha_archive::index_read_idx(byte *buf, uint index, const byte *key, int ha_archive::index_read_idx(byte *buf, uint index, const byte *key,
uint key_len, enum ha_rkey_function find_flag) uint key_len, enum ha_rkey_function find_flag)
{ {
int rc= 0; int rc;
bool found= 0; bool found= 0;
KEY *mkey= &table->s->key_info[index]; KEY *mkey= &table->s->key_info[index];
current_k_offset= mkey->key_part->offset; current_k_offset= mkey->key_part->offset;
...@@ -933,22 +933,10 @@ int ha_archive::index_read_idx(byte *buf, uint index, const byte *key, ...@@ -933,22 +933,10 @@ int ha_archive::index_read_idx(byte *buf, uint index, const byte *key,
DBUG_ENTER("ha_archive::index_read_idx"); DBUG_ENTER("ha_archive::index_read_idx");
/* rc= rnd_init(TRUE);
All of the buffer must be written out or we won't see all of the
data
*/
pthread_mutex_lock(&share->mutex);
azflush(&(share->archive_write), Z_SYNC_FLUSH);
pthread_mutex_unlock(&share->mutex);
/* if (rc)
Set the position of the local read thread to the beginning postion.
*/
if (read_data_header(&archive))
{
rc= HA_ERR_CRASHED_ON_USAGE;
goto error; goto error;
}
while (!(get_row(&archive, buf))) while (!(get_row(&archive, buf)))
{ {
......
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