summaryrefslogtreecommitdiff
path: root/storage/innobase/include/log0log.h
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/include/log0log.h')
-rw-r--r--storage/innobase/include/log0log.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h
index 61318e34561..ad9710b1870 100644
--- a/storage/innobase/include/log0log.h
+++ b/storage/innobase/include/log0log.h
@@ -147,6 +147,13 @@ lsn_t
log_get_lsn(void);
/*=============*/
/************************************************************//**
+Gets the current lsn.
+@return current lsn */
+UNIV_INLINE
+lsn_t
+log_get_lsn_nowait(void);
+/*=============*/
+/************************************************************//**
Gets the last lsn that is fully flushed to disk.
@return last flushed lsn */
UNIV_INLINE
@@ -649,13 +656,13 @@ extern log_t* log_sys;
megabyte.
This information might have been used
- since ibbackup version 0.35 but
+ since mysqlbackup version 0.35 but
before 1.41 to decide if unused ends of
non-auto-extending data files
in space 0 can be truncated.
This information was made obsolete
- by ibbackup --compress. */
+ by mysqlbackup --compress. */
#define LOG_CHECKPOINT_FSP_MAGIC_N (12 + LOG_CHECKPOINT_ARRAY_END)
/*!< Not used (0);
This magic number tells if the
@@ -684,7 +691,7 @@ extern log_t* log_sys;
/* a 32-byte field which contains
the string 'ibbackup' and the
creation time if the log file was
- created by ibbackup --restore;
+ created by mysqlbackup --restore;
when mysqld is first time started
on the restored database, it can
print helpful info for the user */