Merge lp:~vkolesnikov/pbxt/pbxt-pbxt_max_threads_ro into lp:pbxt

Proposed by Vladimir Kolesnikov
Status: Merged
Merged at revision: not available
Proposed branch: lp:~vkolesnikov/pbxt/pbxt-pbxt_max_threads_ro
Merge into: lp:pbxt
Diff against target: 31 lines
2 files modified
ChangeLog (+2/-0)
src/ha_pbxt.cc (+2/-2)
To merge this branch: bzr merge lp:~vkolesnikov/pbxt/pbxt-pbxt_max_threads_ro
Reviewer Review Type Date Requested Status
Paul McCullagh Approve
Review via email: mp+12411@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paul McCullagh (paul-mccullagh) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2009-09-22 17:03:39 +0000
+++ ChangeLog 2009-09-25 13:30:27 +0000
@@ -3,6 +3,8 @@
33
4------- 1.0.09d RC3 - Not yet released4------- 1.0.09d RC3 - Not yet released
55
6RN277: Added r/o flag to pbxt_max_threads server variable (this fix is related to bug bug #430637)
7
6RN276: Added test case for replication on tables w/o PKs (see bug #430716)8RN276: Added test case for replication on tables w/o PKs (see bug #430716)
79
8RN275: Fixed bug #430600: 'Failed to read auto-increment value from storage engine' error.10RN275: Fixed bug #430600: 'Failed to read auto-increment value from storage engine' error.
911
=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc 2009-09-23 07:53:51 +0000
+++ src/ha_pbxt.cc 2009-09-25 13:30:27 +0000
@@ -5680,12 +5680,12 @@
56805680
5681#ifdef DRIZZLED5681#ifdef DRIZZLED
5682static MYSQL_SYSVAR_INT(max_threads, pbxt_max_threads,5682static MYSQL_SYSVAR_INT(max_threads, pbxt_max_threads,
5683 PLUGIN_VAR_OPCMDARG,5683 PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
5684 "The maximum number of threads used by PBXT",5684 "The maximum number of threads used by PBXT",
5685 NULL, NULL, 500, 20, 20000, 1);5685 NULL, NULL, 500, 20, 20000, 1);
5686#else5686#else
5687static MYSQL_SYSVAR_INT(max_threads, pbxt_max_threads,5687static MYSQL_SYSVAR_INT(max_threads, pbxt_max_threads,
5688 PLUGIN_VAR_OPCMDARG,5688 PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
5689 "The maximum number of threads used by PBXT, 0 = set according to MySQL max_connections.",5689 "The maximum number of threads used by PBXT, 0 = set according to MySQL max_connections.",
5690 NULL, NULL, 0, 0, 20000, 1);5690 NULL, NULL, 0, 0, 20000, 1);
5691#endif5691#endif

Subscribers

People subscribed via source and target branches