Merge lp:~percona-dev/percona-xtradb/fix-bug509017 into lp:~percona-dev/percona-xtradb/extensions-1.0.6

Proposed by Yasufumi Kinoshita
Status: Merged
Merged at revision: not available
Proposed branch: lp:~percona-dev/percona-xtradb/fix-bug509017
Merge into: lp:~percona-dev/percona-xtradb/extensions-1.0.6
Diff against target: 42 lines (+14/-2)
1 file modified
innodb_purge_thread.patch (+14/-2)
To merge this branch: bzr merge lp:~percona-dev/percona-xtradb/fix-bug509017
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+17576@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innodb_purge_thread.patch'
2--- innodb_purge_thread.patch 2009-12-14 09:37:23 +0000
3+++ innodb_purge_thread.patch 2010-01-18 09:43:12 +0000
4@@ -147,6 +147,18 @@
5 /* if TRUE, then we auto-extend the last data file */
6 UNIV_INTERN ibool srv_auto_extend_last_data_file = FALSE;
7 /* if != 0, this tells the max size auto-extending may increase the
8+@@ -2536,10 +2538,10 @@
9+ srv_main_thread_process_no = os_proc_get_number();
10+ srv_main_thread_id = os_thread_pf(os_thread_get_curr_id());
11+
12+- srv_table_reserve_slot(SRV_MASTER);
13+
14+ mutex_enter(&kernel_mutex);
15+
16++ srv_table_reserve_slot(SRV_MASTER);
17+ srv_n_threads_active[SRV_MASTER]++;
18+
19+ mutex_exit(&kernel_mutex);
20 @@ -2866,6 +2868,7 @@
21 /* Flush logs if needed */
22 srv_sync_log_buffer_in_background();
23@@ -205,8 +217,8 @@
24 + os_thread_pf(os_thread_get_curr_id()));
25 +#endif
26 +
27++ mutex_enter(&kernel_mutex);
28 + srv_table_reserve_slot(SRV_PURGE);
29-+ mutex_enter(&kernel_mutex);
30 + srv_n_threads_active[SRV_PURGE]++;
31 + mutex_exit(&kernel_mutex);
32 +
33@@ -293,8 +305,8 @@
34 + fprintf(stderr, "Purge worker thread starts, id %lu\n",
35 + os_thread_pf(os_thread_get_curr_id()));
36 +#endif
37++ mutex_enter(&kernel_mutex);
38 + srv_table_reserve_slot(SRV_PURGE_WORKER);
39-+ mutex_enter(&kernel_mutex);
40 + srv_n_threads_active[SRV_PURGE_WORKER]++;
41 + mutex_exit(&kernel_mutex);
42 +

Subscribers

No one subscribed via source and target branches