summaryrefslogtreecommitdiff
path: root/include/maria.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-11-07 14:25:29 +0200
committerMichael Widenius <monty@askmonty.org>2010-11-07 14:25:29 +0200
commit9d68ccdeb8692b05d9cc0479d8d3757edbc49368 (patch)
tree0a17bea389e830f45d0e2bc2ed5e682a20ea2daf /include/maria.h
parenta1bd9532352aed69f03b632658b4ba20512b9cd1 (diff)
downloadmariadb-git-9d68ccdeb8692b05d9cc0479d8d3757edbc49368.tar.gz
Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of the index file before it's repaired.
Removed wrong call to translog_buffer_unlock() that caused 'unlocking not locked mutex' failure in Aria log handler. extra/replace.c: Updated call to my_redel() include/maria.h: Updated prototype for maria_change_to_newfile include/my_sys.h: Updated prototypes Added my_create_backup_name include/myisam.h: Updated prototypes include/myisamchk.h: Added 'backup_time' to st_handler_check_param to be able to generate same name for backuped data and index file mysys/my_redel.c: Added time_t option to my_redel() to be able to generate same backup extensions for many files sql/handler.cc: Added start_time to st_ha_check_opt sql/handler.h: Added start_time to HA_CHECK_OPT sql/mysqld.cc: Added option BACKUP_ALL to --myisam-recover storage/maria/ha_maria.cc: Remember start time for repair storage/maria/ma_check.c: Use remembered start time for backup file names Removed some dead code storage/maria/ma_loghandler.c: Removed wrong call to translog_buffer_unlock() that caused 'unlocking not locked mutex' failure in log handler. storage/maria/maria_chk.c: Removed dead code (O_NEW_INDEX was never set) Report if table was 'crashed on repair' storage/maria/maria_pack.c: Updated parameters to my_redel() storage/myisam/ha_myisam.cc: Added recover option BACKUP_ALL to get a backup of the index file before it's repaired. Print information to log if we make a backup of data as part of repair. storage/myisam/ha_myisam.h: Added HA_RECOVER_FULL_BACKUP storage/myisam/mi_check.c: Use remembered start time for backup file names Added mi_make_backup_of_index() storage/myisam/myisamchk.c: Removed dead code (O_NEW_INDEX was never set) Report if table was 'crashed on repair' storage/myisam/myisampack.c: Updated call to my_redel()
Diffstat (limited to 'include/maria.h')
-rw-r--r--include/maria.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/maria.h b/include/maria.h
index 106aa61ddbb..fb09116a24c 100644
--- a/include/maria.h
+++ b/include/maria.h
@@ -430,7 +430,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,