diff --git a/plugins/mysql-community/index.py b/plugins/mysql-community/index.py index bec36eb18..989524778 100755 --- a/plugins/mysql-community/index.py +++ b/plugins/mysql-community/index.py @@ -8,6 +8,7 @@ import subprocess import re import json +from packaging import version as pk_version web_dir = os.getcwd() + "/web" if os.path.exists(web_dir): @@ -726,7 +727,7 @@ def myDbStatus(version): gets = ['table_open_cache', 'thread_cache_size', 'key_buffer_size', 'tmp_table_size', 'max_heap_table_size', 'innodb_buffer_pool_size', 'innodb_additional_mem_pool_size', 'innodb_log_buffer_size', 'max_connections', 'sort_buffer_size', 'read_buffer_size', 'read_rnd_buffer_size', 'join_buffer_size', 'thread_stack', 'binlog_cache_size'] - if version != "8.0": + if pk_version.parse(ver) < pk_version.parse("8.0"): gets.append('query_cache_size') result['mem'] = {} @@ -743,8 +744,7 @@ def setDbStatus(version): gets = ['key_buffer_size', 'tmp_table_size', 'max_heap_table_size', 'innodb_buffer_pool_size', 'innodb_log_buffer_size', 'max_connections', 'table_open_cache', 'thread_cache_size', 'sort_buffer_size', 'read_buffer_size', 'read_rnd_buffer_size', 'join_buffer_size', 'thread_stack', 'binlog_cache_size'] - if version != "8.0": - # gets.append('query_cache_size') + if pk_version.parse(ver) < pk_version.parse("8.0"): gets = ['key_buffer_size', 'query_cache_size', 'tmp_table_size', 'max_heap_table_size', 'innodb_buffer_pool_size', 'innodb_log_buffer_size', 'max_connections', 'table_open_cache', 'thread_cache_size', 'sort_buffer_size', 'read_buffer_size', 'read_rnd_buffer_size', 'join_buffer_size', 'thread_stack', 'binlog_cache_size']