diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:48:41 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:48:41 +0300 |
commit | 2f7b37b02154748b223e385a7d7787900ab37b5e (patch) | |
tree | 49a5ab1928bd840c129bd14ce72c5cf2c0190e20 /sql/ha_partition.cc | |
parent | 7f03b1d78f2aab738e38a1e33ac887757604585a (diff) | |
parent | b811c6ecc74cc1421eedc92573447768d1eb7980 (diff) | |
download | mariadb-git-2f7b37b02154748b223e385a7d7787900ab37b5e.tar.gz |
Merge 10.3 into 10.4, except MDEV-22543
Also, fix GCC -Og -Wmaybe-uninitialized in run_backup_stage()
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r-- | sql/ha_partition.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index b767045fa26..f745acda75f 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -9593,7 +9593,6 @@ double ha_partition::read_time(uint index, uint ranges, ha_rows rows) ha_rows ha_partition::records() { - int error; ha_rows tot_rows= 0; uint i; DBUG_ENTER("ha_partition::records"); @@ -9602,9 +9601,10 @@ ha_rows ha_partition::records() i < m_tot_parts; i= bitmap_get_next_set(&m_part_info->read_partitions, i)) { - ha_rows rows; - if (unlikely((error= m_file[i]->pre_records()) || - (rows= m_file[i]->records()) == HA_POS_ERROR)) + if (unlikely(m_file[i]->pre_records())) + DBUG_RETURN(HA_POS_ERROR); + const ha_rows rows= m_file[i]->records(); + if (unlikely(rows == HA_POS_ERROR)) DBUG_RETURN(HA_POS_ERROR); tot_rows+= rows; } |