Merge remote-tracking branch 'origin/5.5' into 10.0

This commit is contained in:
vicentiu 2017-01-06 17:09:59 +02:00
commit e9aed131ea
76 changed files with 934 additions and 435 deletions

View file

@ -4524,7 +4524,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= 0;
if (table_flags() & (HA_HAS_OLD_CHECKSUM | HA_HAS_OLD_CHECKSUM))
if (table_flags() & (HA_HAS_OLD_CHECKSUM | HA_HAS_NEW_CHECKSUM))
stat_info->check_sum= checksum();
return;
}