database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Ensure that test_quick_select doesn't return more rows than in the table

Browse Source 
Other changes:
- In test_quick_select(), assume that if table->used_stats_records is 0
  then the table has 0 rows.
- Fixed prepare_simple_select() to populate table->used_stat_records
- Enusre that set_statistics_for_tables() doesn't cause used_stats_records
  to be 0 when using stat_tables.
- To get blackhole to work with replication, set stats.records to 2 so
  that test_quick_select() doesn't assume the table is empty.
This commit is contained in:
Monty
2021-10-05 17:08:16 +03:00
committed by Sergei Petrunia
parent 8b977a6c3a
commit c443dbff0e
16 changed files with 85 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_help.cc
View File

@@ -664,16 +664,19 @@ SQL_SELECT *prepare_simple_select(THD *thd, Item *cond,
/* Assume that no indexes cover all required fields */
table->covering_keys.clear_all();
table->file->info(HA_STATUS_VARIABLE);
table->used_stat_records= table->file->stats.records;
SQL_SELECT *res= make_select(table, 0, 0, cond, 0, 0, error);
if (unlikely(*error) ||
(likely(res) && unlikely(res->check_quick(thd, 0, HA_POS_ERROR))) ||
(likely(res) && res->quick && unlikely(res->quick->reset())))
{
delete res;
res=0;
}
return res;
if (unlikely(!res) || unlikely(*error))
goto error;
(void) res->check_quick(thd, 0, HA_POS_ERROR);
if (!res->quick || res->quick->reset() == 0)
return res;
error:
delete res;
return 0;
}
/*
@@ -1076,7 +1079,9 @@ error:
new_trans.restore_old_transaction();
error2:
DBUG_RETURN(TRUE);
if (!thd->is_error())
my_eof(thd);
DBUG_RETURN(thd->is_error());
}