← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/log/log0log.c

Merge Stewart - Update innobase plugin to be based on innodb 1.1.4 from MySQL 5.5.8 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/log/log0log.c
3098
3098
 
3099
3099
        if (srv_fast_shutdown < 2
3100
3100
           && (srv_error_monitor_active
3101
 
              || srv_lock_timeout_active || srv_monitor_active)) {
 
3101
              || srv_lock_timeout_active
 
3102
              || srv_monitor_active)) {
3102
3103
 
3103
3104
                mutex_exit(&kernel_mutex);
3104
3105
 
 
3106
                os_event_set(srv_error_event);
 
3107
                os_event_set(srv_monitor_event);
 
3108
                os_event_set(srv_timeout_event);
 
3109
 
3105
3110
                goto loop;
3106
3111
        }
3107
3112
 
3128
3133
 
3129
3134
                log_buffer_flush_to_disk();
3130
3135
 
 
3136
                mutex_exit(&kernel_mutex);
 
3137
 
3131
3138
                return; /* We SKIP ALL THE REST !! */
3132
3139
        }
3133
3140