← Back to branch summary

~ihanick/percona-server/5.1-innodb-log_archiving

« back to all changes in this revision

Viewing changes to Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc

  • Committer: Nickolay
  • Date: 2012-02-29 04:33:54 UTC
  • Revision ID: ihanick@lomonosov.msu.ru-20120229043354-2n9w5te0y9xudoba
clean up the code

Show diffs side-by-side

added added

removed removed

Lines of Context:
Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc
320
320
 
321
321
static int innobase_purge_archive_logs(handlerton *hton, time_t before_date, const char* to_filename) {
322
322
        if (before_date > 0) {
323
 
                purge_archived_logs(ut_time() - before_date, 0);
 
323
                purge_archived_logs(before_date, 0);
324
324
        } else if (to_filename) {
325
325
                if (to_filename == strstr(to_filename,"ib_log_archive_")) {
326
326
                        unsigned long long log_file_lsn = strtoll(to_filename + strlen("ib_log_archive_"), NULL, 10);
2506
2506
        srv_log_archive_on = (ulint) innobase_log_archive;
2507
2507
#endif /* UNIV_LOG_ARCHIVE */
2508
2508
        log_xtra_log_archive_on = (ulint) innobase_xtra_log_archive;
 
2509
        log_xtra_log_expire_sec = (ulint) innodb_xtra_expire_archive_logs_sec;
 
2510
 
2509
2511
        if (innobase_xtra_log_archive_dir && strlen(innobase_xtra_log_archive_dir) > 0) {
2510
2512
                log_xtra_log_archive_dir = innobase_xtra_log_archive_dir;
2511
2513
        } else {
2512
2514
                log_xtra_log_archive_dir = innobase_log_group_home_dir;
2513
2515
        }
2514
 
        log_xtra_log_expire_sec = (ulint) innodb_xtra_expire_archive_logs_sec;
2515
2516
        srv_log_buffer_size = (ulint) innobase_log_buffer_size;
2516
2517
 
2517
2518
        srv_buf_pool_size = (ulint) innobase_buffer_pool_size;
11179
11180
        const void*                     save)           /*!< in: immediate result
11180
11181
                                                        from check function */
11181
11182
{
 
11183
        mutex_enter(&(log_sys->archived_mutex));
11182
11184
        if (*(my_bool*) save) {
11183
11185
                if (FALSE == log_xtra_log_archive_on) {
11184
 
                        mutex_enter(&(log_sys->archived_mutex));
11185
11186
                        innobase_xtra_log_archive=TRUE;
11186
11187
                        log_xtra_log_archive_on=TRUE;
11187
 
                        mutex_exit(&(log_sys->archived_mutex));
11188
11188
                        os_thread_create(&srv_log_archive_thread, NULL, NULL);
11189
11189
                }
11190
11190
        } else {
11191
11191
                if (TRUE == log_xtra_log_archive_on) {
11192
 
                        mutex_enter(&(log_sys->archived_mutex));
11193
11192
                        innobase_xtra_log_archive=FALSE;
11194
11193
                        log_xtra_log_archive_on=FALSE;
11195
 
                        mutex_exit(&(log_sys->archived_mutex));
11196
11194
                        os_event_set(log_sys->archive_thread);
11197
11195
                }
11198
11196
        }
 
11197
        mutex_exit(&(log_sys->archived_mutex));
11199
11198
}
11200
11199
 
11201
11200
/****************************************************************//**