From f63f1848557993953320c37c7e350befd528b35c Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 12 Jul 2022 12:05:48 +0800 Subject: [PATCH] up --- plugins/mariadb/conf/my.cnf | 1 - plugins/mariadb/conf/my5.7.cnf | 96 --------------------------------- plugins/mariadb/conf/my8.0.cnf | 98 ---------------------------------- plugins/mariadb/index.py | 2 +- plugins/mariadb/info.json | 8 +-- 5 files changed, 5 insertions(+), 200 deletions(-) delete mode 100644 plugins/mariadb/conf/my5.7.cnf delete mode 100644 plugins/mariadb/conf/my8.0.cnf diff --git a/plugins/mariadb/conf/my.cnf b/plugins/mariadb/conf/my.cnf index c699ed3e3..651aff4e5 100644 --- a/plugins/mariadb/conf/my.cnf +++ b/plugins/mariadb/conf/my.cnf @@ -69,7 +69,6 @@ innodb_data_home_dir = {$SERVER_APP_PATH}/data innodb_data_file_path = ibdata1:10M:autoextend innodb_log_group_home_dir = {$SERVER_APP_PATH}/data innodb_buffer_pool_size = 16M -innodb_additional_mem_pool_size = 2M innodb_log_file_size = 5M innodb_log_buffer_size = 8M innodb_flush_log_at_trx_commit = 1 diff --git a/plugins/mariadb/conf/my5.7.cnf b/plugins/mariadb/conf/my5.7.cnf deleted file mode 100644 index b0a71d37f..000000000 --- a/plugins/mariadb/conf/my5.7.cnf +++ /dev/null @@ -1,96 +0,0 @@ -[client] -user = root -#password = your_password -port = 3306 -socket = {$SERVER_APP_PATH}/mysql.sock -default-character-set = UTF8MB4 - -[mysqld] -pid-file = {$SERVER_APP_PATH}/data/mysql.pid -user = mysql -port = 3306 -socket = {$SERVER_APP_PATH}/mysql.sock -basedir = {$SERVER_APP_PATH} -datadir = {$SERVER_APP_PATH}/data -log-error = {$SERVER_APP_PATH}/data/error.log -default_storage_engine = MyISAM - -key_buffer_size = 8M -table_open_cache = 32 -sort_buffer_size = 256K -net_buffer_length = 4K -read_buffer_size = 128K -read_rnd_buffer_size = 256K -myisam_sort_buffer_size = 4M -thread_cache_size = 4 -lower_case_table_names=0 -tmp_table_size = 8M -character-set-server = UTF8MB4 - -max_connections = 500 -max_connect_errors = 100 -open_files_limit = 2560 -max_allowed_packet = 128M - -#skip-external-locking -#skip-grant-tables -#loose-skip-innodb -#skip-networking -#skip-name-resolve - -log-bin=mysql-bin -binlog_format=mixed -server-id = 1 -slow_query_log=1 -slow-query-log-file={$SERVER_APP_PATH}/data/mysql-slow.log -long_query_time=3 -#log_queries_not_using_indexes=on - -relay-log=mdserver -relay-log-index=mdserver - -#master -#binlog-do-db -binlog-ignore-db = test -binlog-ignore-db = mysql -binlog-ignore-db = information_schema -binlog-ignore-db = performance_schema - -#slave -log-slave-updates -#replicate-do-db -replicate-ignore-db = information_schema -replicate-ignore-db = performance_schema -replicate-ignore-db = mysql -replicate-ignore-db = test - -default_storage_engine = InnoDB -innodb_data_home_dir = {$SERVER_APP_PATH}/data -innodb_data_file_path = ibdata1:10M:autoextend -innodb_log_group_home_dir = {$SERVER_APP_PATH}/data -innodb_buffer_pool_size = 16M -innodb_log_file_size = 5M -innodb_log_buffer_size = 8M -innodb_flush_log_at_trx_commit = 1 -innodb_lock_wait_timeout = 120 -innodb_max_dirty_pages_pct = 90 -innodb_read_io_threads = 1 -innodb_write_io_threads = 1 -innodb_file_per_table=1 - -secure-file-priv={$SERVER_APP_PATH}/tmp - -[mysqldump] -quick - -[mysql] -no-auto-rehash - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout \ No newline at end of file diff --git a/plugins/mariadb/conf/my8.0.cnf b/plugins/mariadb/conf/my8.0.cnf deleted file mode 100644 index 7e390ce92..000000000 --- a/plugins/mariadb/conf/my8.0.cnf +++ /dev/null @@ -1,98 +0,0 @@ -[client] -user = root -#password = your_password -port = 3306 -socket = {$SERVER_APP_PATH}/mysql.sock -default-character-set = UTF8MB4 - -[mysqld] -default_authentication_plugin=mysql_native_password -pid-file = {$SERVER_APP_PATH}/data/mysql.pid -user = mysql -port = 3306 -socket = {$SERVER_APP_PATH}/mysql.sock -basedir = {$SERVER_APP_PATH} -datadir = {$SERVER_APP_PATH}/data -log-error = {$SERVER_APP_PATH}/data/error.log -default_storage_engine = MyISAM - -key_buffer_size = 8M -table_open_cache = 32 -sort_buffer_size = 256K -net_buffer_length = 4K -read_buffer_size = 128K -read_rnd_buffer_size = 256K -myisam_sort_buffer_size = 4M -thread_cache_size = 4 -lower_case_table_names=0 -tmp_table_size = 8M -character-set-server = UTF8MB4 - -max_connections = 500 -max_connect_errors = 100 -open_files_limit = 2560 -max_allowed_packet = 128M - -#skip-external-locking -#skip-grant-tables -#loose-skip-innodb -#skip-networking -#skip-name-resolve - -log-bin=mysql-bin -binlog_format=mixed -server-id = 1 -slow_query_log=1 -slow-query-log-file={$SERVER_APP_PATH}/data/mysql-slow.log -long_query_time=3 -#log_queries_not_using_indexes=on - -relay-log=mdserver -relay-log-index=mdserver - -#master -#binlog-do-db -binlog-ignore-db = test -binlog-ignore-db = mysql -binlog-ignore-db = information_schema -binlog-ignore-db = performance_schema - -#slave -log_replica_updates -#replicate-do-db -replicate-ignore-db = information_schema -replicate-ignore-db = performance_schema -replicate-ignore-db = mysql -replicate-ignore-db = test - -default_storage_engine = InnoDB -innodb_data_home_dir = {$SERVER_APP_PATH}/data -innodb_data_file_path = ibdata1:10M:autoextend -innodb_log_group_home_dir = {$SERVER_APP_PATH}/data -innodb_buffer_pool_size = 16M -innodb_log_file_size = 5M -innodb_log_buffer_size = 8M -innodb_flush_log_at_trx_commit = 1 -innodb_lock_wait_timeout = 120 -innodb_max_dirty_pages_pct = 90 -innodb_read_io_threads = 1 -innodb_write_io_threads = 1 -innodb_file_per_table=1 -binlog_expire_logs_seconds=2592000 - -secure-file-priv={$SERVER_APP_PATH}/tmp - -[mysqldump] -quick - -[mysql] -no-auto-rehash - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout \ No newline at end of file diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py index 2fb790159..d9ff9652c 100755 --- a/plugins/mariadb/index.py +++ b/plugins/mariadb/index.py @@ -1914,7 +1914,7 @@ def uninstallPreInspection(version): if __name__ == "__main__": func = sys.argv[1] - version = "5.6" + version = "10.6" if (len(sys.argv) > 2): version = sys.argv[2] diff --git a/plugins/mariadb/info.json b/plugins/mariadb/info.json index 65df8cf16..440997690 100755 --- a/plugins/mariadb/info.json +++ b/plugins/mariadb/info.json @@ -5,14 +5,14 @@ "type":"运行环境", "ps":"[DEV]一种关系数据库管理系统!", "uninstall_pre_inspection":true, - "checks": "server/mariadb/VERSION/bin/mysql", - "path": "server/mariadb/VERSION", - "versions":["10.6", "5.6", "5.7","8.0"], + "checks": "server/mariadb", + "path": "server/mariadb", + "versions":["10.6"], "shell":"install.sh", "checks":"server/mariadb", "path":"server/mariadb", "author":"mariadb", - "home":"https://mariadb.com/products/community-server/", + "home":"https://mariadb.org/", "date":"2022-07-12", "pid": "2" } \ No newline at end of file