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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2022-07-01 13:10:36 +03:00
parent 99de8cc028 990cde800a
commit 392ee571c1
32 changed files with 253 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_statistics.cc
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2009 MySQL AB
Copyright (c) 2019, 2020, MariaDB Corporation.
Copyright (c) 2019, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -2525,7 +2525,6 @@ int collect_statistics_for_index(THD *thd, TABLE *table, uint index)
{
int rc= 0;
KEY *key_info= &table->key_info[index];
ha_rows rows= 0;
DBUG_ENTER("collect_statistics_for_index");
@ -2560,7 +2559,6 @@ int collect_statistics_for_index(THD *thd, TABLE *table, uint index)
if (rc)
break;
rows++;
index_prefix_calc.add();
rc= table->file->ha_index_next(table->record[0]);
}