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.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-06-13 18:36:09 +03:00
parent d46db415ce 8e3a4be45c
commit 984d7100cd
157 changed files with 3036 additions and 2605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/handler.cc
View File

@ -4859,6 +4859,7 @@ void handler::get_dynamic_partition_info(PARTITION_STATS *stat_info,
stat_info->update_time= stats.update_time;
stat_info->check_time= stats.check_time;
stat_info->check_sum= stats.checksum;
stat_info->check_sum_null= stats.checksum_null;
}
@ -5013,7 +5014,7 @@ int handler::calculate_checksum()
return HA_ERR_ABORTED_BY_USER;
ha_checksum row_crc= 0;
error= table->file->ha_rnd_next(table->record[0]);
error= ha_rnd_next(table->record[0]);
if (error)
break;
@ -5067,7 +5068,7 @@ int handler::calculate_checksum()
stats.checksum+= row_crc;
}
table->file->ha_rnd_end();
ha_rnd_end();
return error == HA_ERR_END_OF_FILE ? 0 : error;
}