summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-03-08 11:40:43 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-03-08 11:40:43 +0200
commit47396ddea91698f6ea1829697566a4d7c31bc789 (patch)
tree552acc26b963574a234d2a3bc22b2190e5eabf0e /sql-common
parentc4f3e64c23fe7f7fd18c0a79f87f9771df15fe9f (diff)
parent6860a4b55664d8fc53636906240c089417e1849d (diff)
downloadmariadb-git-47396ddea91698f6ea1829697566a4d7c31bc789.tar.gz
Merge 5.5 into 10.0
Also, implement MDEV-11027 a little differently from 5.5: recv_sys_t::report(ib_time_t): Determine whether progress should be reported. recv_apply_hashed_log_recs(): Rename the parameter to last_batch.
Diffstat (limited to 'sql-common')
0 files changed, 0 insertions, 0 deletions