database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-07-01 15:24:50 +03:00
parent ba3354fca6 b546913ba2
commit 62a20f8047
48 changed files with 526 additions and 269 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
@ -2516,7 +2516,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");
@ -2551,7 +2550,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]);
}