1 |
jpp |
1.1 |
diff -Nur --no-dereference e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/009innodb e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/009innodb |
2 |
|
|
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/009innodb 1969-12-31 19:00:00.000000000 -0500 |
3 |
|
|
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/009innodb 2021-03-04 15:06:53.690000000 -0500 |
4 |
|
|
@@ -0,0 +1,14 @@ |
5 |
|
|
+ |
6 |
|
|
+#innodb |
7 |
|
|
+{# https://mariadb.com/kb/en/innodb-system-variables/#innodb_large_prefix |
8 |
|
|
+#default Off up to 10.2.1 |
9 |
|
|
+# removed in 10.3.1 and 10.6.0 |
10 |
|
|
+# keep it there up to 10.2.2 |
11 |
|
|
+}innodb_large_prefix=1 |
12 |
|
|
+{#https://mariadb.com/kb/en/innodb-system-variables/#innodb_file_format |
13 |
|
|
+# default is antelope up to 10.2.1 |
14 |
|
|
+# keep it up to 10.2.2 |
15 |
|
|
+}innodb_file_format={ $mariadb{'innodb_file_format'}||'barracuda' } |
16 |
|
|
+{# enabled is already the default |
17 |
|
|
+}innodb_file_per_table={ $mariadb{'innodb_file_per_table'}||'1' } |
18 |
|
|
+ |
19 |
|
|
diff -Nur --no-dereference e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/014server_system_variables e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/014server_system_variables |
20 |
|
|
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/014server_system_variables 1969-12-31 19:00:00.000000000 -0500 |
21 |
|
|
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/014server_system_variables 2021-03-04 15:07:04.354000000 -0500 |
22 |
|
|
@@ -0,0 +1,90 @@ |
23 |
|
|
+{ |
24 |
|
|
+ $OUT = ''; |
25 |
|
|
+ my $var; |
26 |
|
|
+ $var = ${'mariadb'}{'MaxConnections'} || undef; |
27 |
|
|
+ #default 151; range 10 to 100000 |
28 |
|
|
+ $OUT .= "max_connections=$var\n" if defined $var; |
29 |
|
|
+ |
30 |
|
|
+ $var = ${'mariadb'}{'WaitTimeout'} || undef; |
31 |
|
|
+ #default 28800 |
32 |
|
|
+ $OUT .= "wait_timeout=$var\n" if defined $var; |
33 |
|
|
+ |
34 |
|
|
+ $var = ${'mariadb'}{'QueryCacheLimit'} || undef; |
35 |
|
|
+ #default 1048576 (1M) |
36 |
|
|
+ $OUT .= "query_cache_limit=$var\n" if defined $var; |
37 |
|
|
+ |
38 |
|
|
+ $var = ${'mariadb'}{'QueryCacheSize'} || '1M'; |
39 |
|
|
+ #default 1048576 (1M) |
40 |
|
|
+ $OUT .= "query_cache_size=$var\n" if defined $var; |
41 |
|
|
+ |
42 |
|
|
+ $var = ${'mariadb'}{'QueryCacheType'} || '1'; |
43 |
|
|
+ #default 0 or OFF, 1 or ON, 2 or DEMAND |
44 |
|
|
+ $OUT .= "query_cache_type=$var\n" if defined $var; |
45 |
|
|
+ |
46 |
|
|
+ $var = ${'mariadb'}{'SortBufferSize'} || undef; |
47 |
|
|
+ #default 2M |
48 |
|
|
+ $OUT .= "sort_buffer_size=$var\n" if defined $var; |
49 |
|
|
+ |
50 |
|
|
+ $var = ${'mariadb'}{'ReadRndBufferSize'} || undef; |
51 |
|
|
+ #default 262144 from 8200 to 2147483647 |
52 |
|
|
+ $OUT .= "read_rnd_buffer_size=$var\n" if defined $var; |
53 |
|
|
+ |
54 |
|
|
+ $var = ${'mariadb'}{'TableOpenCache'} || undef; |
55 |
|
|
+ #default 400 (2000 sice 10.1.7) |
56 |
|
|
+ $OUT .= "table_open_cache=$var\n" if defined $var; |
57 |
|
|
+ |
58 |
|
|
+ #Introduced: MariaDB 10.2.2 |
59 |
|
|
+ #$var = ${'mariadb'}{'TableOpenCacheInstances'} || undef; |
60 |
|
|
+ ##default 8 |
61 |
|
|
+ #$OUT .= "table_open_cache_instances=$var\n" if defined $var; |
62 |
|
|
+ |
63 |
|
|
+ $var = ${'mariadb'}{'TmpTableSize'} || undef; |
64 |
|
|
+ #default 16M |
65 |
|
|
+ $OUT .= "tmp_table_size=$var\n" if defined $var; |
66 |
|
|
+ |
67 |
|
|
+ $var = ${'mariadb'}{'MaxHeapTableSize'} || undef; |
68 |
|
|
+ #default 16M |
69 |
|
|
+ $OUT .= "max_heap_table_size=$var\n" if defined $var; |
70 |
|
|
+ |
71 |
|
|
+ $var = ${'mariadb'}{'ThreadCacheSize'} || 256; |
72 |
|
|
+ #default 0 from 0 to 16384 |
73 |
|
|
+ $OUT .= "thread_cache_size=$var\n" if defined $var; |
74 |
|
|
+ |
75 |
|
|
+ $var = ${'mariadb'}{'KeyBufferSize'} || undef; |
76 |
|
|
+ #default 134217728 - myisam only |
77 |
|
|
+ $OUT .= "key_buffer_size=$var\n" if defined $var; |
78 |
|
|
+ |
79 |
|
|
+ $var = ${'mariadb'}{'MyisamSortBufferSize'} || undef; |
80 |
|
|
+ #default 128M - before 10.0.3: 8M |
81 |
|
|
+ $OUT .= "myisam_sort_buffer_size=$var\n" if defined $var; |
82 |
|
|
+ |
83 |
|
|
+ $var = ${'mariadb'}{'JoinBufferSize'} || 262144; |
84 |
|
|
+ #default 262144 |
85 |
|
|
+ $OUT .= "join_buffer_size=$var\n" if defined $var; |
86 |
|
|
+ |
87 |
|
|
+ $var = ${'mariadb'}{'ReadBufferSize'} || undef; |
88 |
|
|
+ #default 131072 |
89 |
|
|
+ $OUT .= "read_buffer_size=$var\n" if defined $var; |
90 |
|
|
+ |
91 |
|
|
+ $var = ${'mariadb'}{'ConnectTimeout'} || undef; |
92 |
|
|
+ #default 10 |
93 |
|
|
+ $OUT .= "connect_timeout=$var\n" if defined $var; |
94 |
|
|
+ |
95 |
|
|
+ $var = ${'mariadb'}{'MaxConnectErrors'} || 100; |
96 |
|
|
+ #default 100 |
97 |
|
|
+ $OUT .= "max_connect_errors=$var\n" if defined $var; |
98 |
|
|
+ |
99 |
|
|
+ $var = ${'mariadb'}{'MaxAllowedPacket'} || '4M'; |
100 |
|
|
+ #default 4M |
101 |
|
|
+ $OUT .= "max_allowed_packet=$var\n" if defined $var; |
102 |
|
|
+ |
103 |
|
|
+ $var = ${'mariadb'}{'SlowQueries'} ||undef; |
104 |
|
|
+ if (defined $var) |
105 |
|
|
+ { |
106 |
|
|
+ $OUT .= "log_slow_queries=1\n"; # change to slow_query_log in mariadb 10.1 |
107 |
|
|
+ $OUT .= "long_query_time=$var\n"; |
108 |
|
|
+ $OUT .= "slow_query_log_file=\"/var/log/mariadb/slow_queries.log\"\n"; |
109 |
|
|
+ } |
110 |
|
|
+ |
111 |
|
|
+} |
112 |
|
|
+ |
113 |
|
|
diff -Nur --no-dereference e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/015logerror e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/015logerror |
114 |
|
|
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/015logerror 1969-12-31 19:00:00.000000000 -0500 |
115 |
|
|
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/015logerror 2021-03-04 15:07:12.958000000 -0500 |
116 |
|
|
@@ -0,0 +1,3 @@ |
117 |
|
|
+ |
118 |
|
|
+log_error=/var/log/mariadb/mariadb.log |
119 |
|
|
+ |
120 |
|
|
diff -Nur --no-dereference e-smith-mysql-2.6.0.old/root/etc/logrotate.d/mariadb-sme e-smith-mysql-2.6.0/root/etc/logrotate.d/mariadb-sme |
121 |
|
|
--- e-smith-mysql-2.6.0.old/root/etc/logrotate.d/mariadb-sme 1969-12-31 19:00:00.000000000 -0500 |
122 |
|
|
+++ e-smith-mysql-2.6.0/root/etc/logrotate.d/mariadb-sme 2021-03-04 15:07:49.559000000 -0500 |
123 |
|
|
@@ -0,0 +1,17 @@ |
124 |
|
|
+/var/log/mariadb/*.log { |
125 |
|
|
+ create 640 mysql mysql |
126 |
|
|
+ notifempty |
127 |
|
|
+ daily |
128 |
|
|
+ rotate 3 |
129 |
|
|
+ missingok |
130 |
|
|
+ compress |
131 |
|
|
+ postrotate |
132 |
|
|
+ # just if mysqld is really running |
133 |
|
|
+ if test -x /usr/bin/mysqladmin && \ |
134 |
|
|
+ /usr/bin/mysqladmin ping &>/dev/null |
135 |
|
|
+ then |
136 |
|
|
+ /usr/bin/mysqladmin flush-logs |
137 |
|
|
+ fi |
138 |
|
|
+ endscript |
139 |
|
|
+} |
140 |
|
|
+ |