diff options
author | unknown <knielsen@knielsen-hq.org> | 2010-11-19 22:33:47 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2010-11-19 22:33:47 +0100 |
commit | 95b37a254b0797499b4a940ca8eb8fa907a7664f (patch) | |
tree | bcd57843b07d10746160f485e039446bf4bd616e /include/maria.h | |
parent | 01d41622ba4cdb99327f98d0d1c1772ad842c66a (diff) | |
parent | a967802ae94e1b0ce75436648446621a381838e7 (diff) | |
download | mariadb-git-95b37a254b0797499b4a940ca8eb8fa907a7664f.tar.gz |
Merge MariaDB 5.1->5.2
Diffstat (limited to 'include/maria.h')
-rw-r--r-- | include/maria.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/maria.h b/include/maria.h index 8e5c485767a..1896eb7ed60 100644 --- a/include/maria.h +++ b/include/maria.h @@ -434,7 +434,8 @@ int maria_repair_by_sort(HA_CHECK *param, MARIA_HA *info, int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info, const char *name, my_bool rep_quick); int maria_change_to_newfile(const char *filename, const char *old_ext, - const char *new_ext, myf myflags); + const char *new_ext, time_t backup_time, + myf myflags); void maria_lock_memory(HA_CHECK *param); int maria_update_state_info(HA_CHECK *param, MARIA_HA *info, uint update); void maria_update_key_parts(MARIA_KEYDEF *keyinfo, double *rec_per_key_part, |