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

[Vladimir Kolesnikov]

[Paul McCullagh (paul-mccullagh)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2009-09-22 17:03:39 +0000
+++ ChangeLog	2009-09-25 13:30:27 +0000
@@ -3,6 +3,8 @@
 
 ------- 1.0.09d RC3 - Not yet released
 
+RN277: Added r/o flag to pbxt_max_threads server variable (this fix is related to bug bug #430637)
+
 RN276: Added test case for replication on tables w/o PKs (see bug #430716)
 
 RN275: Fixed bug #430600: 'Failed to read auto-increment value from storage engine' error.

=== 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 @@
 
 #ifdef DRIZZLED
 static MYSQL_SYSVAR_INT(max_threads, pbxt_max_threads,
-	PLUGIN_VAR_OPCMDARG,
+	PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
 	"The maximum number of threads used by PBXT",
 	NULL, NULL, 500, 20, 20000, 1);
 #else
 static MYSQL_SYSVAR_INT(max_threads, pbxt_max_threads,
-	PLUGIN_VAR_OPCMDARG,
+	PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
 	"The maximum number of threads used by PBXT, 0 = set according to MySQL max_connections.",
 	NULL, NULL, 0, 0, 20000, 1);
 #endif