summaryrefslogtreecommitdiff
path: root/storage/innobase/include/log0log.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-10-11 08:41:36 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-10-11 08:41:36 +0300
commitd04f2de80a96b3ff9290ee27507195bfb01fc77f (patch)
tree49da698fbe99c5888f41238b0cda4e1eedebf2e2 /storage/innobase/include/log0log.h
parent5e17b1f7cbfc256850ed139a0a4898040e16ff60 (diff)
parentb05be3ef8c8668ddbcbe8e1c08dcd4fcc88eb4cf (diff)
downloadmariadb-git-d04f2de80a96b3ff9290ee27507195bfb01fc77f.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/include/log0log.h')
-rw-r--r--storage/innobase/include/log0log.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h
index a18684011aa..8769d7066fe 100644
--- a/storage/innobase/include/log0log.h
+++ b/storage/innobase/include/log0log.h
@@ -188,15 +188,13 @@ log_buffer_sync_in_background(
/** Make a checkpoint. Note that this function does not flush dirty
blocks from the buffer pool: it only checks what is lsn of the oldest
modification in the pool, and writes information about the lsn in
-log files. Use log_make_checkpoint_at() to flush also the pool.
+log files. Use log_make_checkpoint() to flush also the pool.
@param[in] sync whether to wait for the write to complete
@return true if success, false if a checkpoint write was already running */
bool log_checkpoint(bool sync);
-/** Make a checkpoint at or after a specified LSN.
-@param[in] lsn the log sequence number, or LSN_MAX
-for the latest LSN */
-void log_make_checkpoint_at(lsn_t lsn);
+/** Make a checkpoint */
+void log_make_checkpoint();
/****************************************************************//**
Makes a checkpoint at the latest lsn and writes it to first page of each