mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
merge fixes
This commit is contained in:
@ -6724,15 +6724,6 @@ int QUICK_RANGE_SELECT::get_next()
|
||||
}
|
||||
}
|
||||
|
||||
void QUICK_SELECT::reset(void)
|
||||
{
|
||||
next= 0;
|
||||
it.rewind();
|
||||
range= 0;
|
||||
if (file->inited == handler::NONE)
|
||||
file->ha_index_init(index);
|
||||
}
|
||||
|
||||
/*
|
||||
Get the next record with a different prefix.
|
||||
|
||||
@ -9386,12 +9377,6 @@ static void print_ror_scans_arr(TABLE *table, const char *msg,
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
void QUICK_SELECT_DESC::reset(void)
|
||||
{
|
||||
rev_it.rewind();
|
||||
QUICK_SELECT::reset();
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
** Print a quick range for debugging
|
||||
** TODO:
|
||||
|
Reference in New Issue
Block a user