summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-07-31 18:09:08 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-07-31 18:09:08 +0300
commit9216114ce729733e6b0c4ce952bfdf57595ff387 (patch)
tree7a541ed87a6a8174d3d94c5f780724a34e08dc1c /sql/sys_vars.cc
parentdc513dff911d72eaaf9f752f390fef8d1ef9a4b0 (diff)
parent66ec3a770f7854f500ece66c78f3c87c9cd6da15 (diff)
downloadmariadb-git-9216114ce729733e6b0c4ce952bfdf57595ff387.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index e46925f5ee0..1c84f308a81 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -3695,6 +3695,12 @@ static bool fix_tp_min_threads(sys_var *, THD *, enum_var_type)
static bool check_threadpool_size(sys_var *self, THD *thd, set_var *var)
{
+
+#ifdef _WIN32
+ if (threadpool_mode != TP_MODE_GENERIC)
+ return false;
+#endif
+
ulonglong v= var->save_result.ulonglong_value;
if (v > threadpool_max_size)
{