/[smeserver]/rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
ViewVC logotype

Annotation of /rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-mariadb_forgotten_var.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Mon Jul 18 07:33:43 2016 UTC (8 years, 4 months ago) by unnilennium
Branch: MAIN
CVS Tags: e-smith-mysql-2_6_0-8_el7_sme, e-smith-mysql-2_6_0-22_el7_sme, e-smith-mysql-2_6_0-20_el7_sme, e-smith-mysql-2_6_0-17_el7_sme, e-smith-mysql-2_6_0-18_el7_sme, e-smith-mysql-2_6_0-10_el7_sme, e-smith-mysql-2_6_0-19_el7_sme, e-smith-mysql-2_6_0-21_el7_sme, e-smith-mysql-2_6_0-15_el7_sme, e-smith-mysql-2_6_0-16_el7_sme, e-smith-mysql-2_6_0-13_el7_sme, e-smith-mysql-2_6_0-14_el7_sme, e-smith-mysql-2_6_0-11_el7_sme, e-smith-mysql-2_6_0-12_el7_sme, e-smith-mysql-2_6_0-9_el7_sme, HEAD 
* Mon Jul 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
- fix forgotten mysqld variables in various scripts [SME: 9438]
-  e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
1 unnilennium 1.1 diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/events/actions/mysql-dump-tables e-smith-mysql-2.6.0/root/etc/e-smith/events/actions/mysql-dump-tables
2     --- e-smith-mysql-2.6.0.old/root/etc/e-smith/events/actions/mysql-dump-tables 2016-02-05 17:29:32.000000000 -0500
3     +++ e-smith-mysql-2.6.0/root/etc/e-smith/events/actions/mysql-dump-tables 2016-07-18 03:27:37.034000000 -0400
4     @@ -1,6 +1,6 @@
5     #!/bin/sh
6    
7     -status=$(/sbin/e-smith/config getprop mysqld status)
8     +status=$(/sbin/e-smith/config getprop mariadb status)
9     if [ "$status" = "disabled" ]
10     then
11     echo "mysqld is disabled - no tables dumped" >&2
12     diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/events/actions/mysql-load-tables e-smith-mysql-2.6.0/root/etc/e-smith/events/actions/mysql-load-tables
13     --- e-smith-mysql-2.6.0.old/root/etc/e-smith/events/actions/mysql-load-tables 2016-02-05 17:29:32.000000000 -0500
14     +++ e-smith-mysql-2.6.0/root/etc/e-smith/events/actions/mysql-load-tables 2016-07-18 03:26:07.858000000 -0400
15     @@ -1,6 +1,6 @@
16     #!/bin/sh
17    
18     -status=$(/sbin/e-smith/config getprop mysqld status)
19     +status=$(/sbin/e-smith/config getprop mariadb status)
20     if [ "$status" = "disabled" ]
21     then
22     echo "mysqld is disabled - no tables restored" >&2
23     diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/009socket e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/009socket
24     --- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/009socket 2003-12-18 17:10:32.000000000 -0500
25     +++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/009socket 2016-07-18 03:23:58.914000000 -0400
26     @@ -1,5 +1,5 @@
27     socket=/var/lib/mysql/mysql.sock
28     {
29     - my $localonly = $mysqld{LocalNetworkingOnly} || "no";
30     + my $localonly = $mariadb{LocalNetworkingOnly} || "no";
31     $OUT = ($localonly eq 'yes') ? "skip-networking" : "# networking is enabled";
32     }
33     diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/012open_files_limit e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/012open_files_limit
34     --- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/012open_files_limit 2013-02-13 18:00:24.000000000 -0500
35     +++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/012open_files_limit 2016-07-18 03:23:30.528000000 -0400
36     @@ -1,7 +1,7 @@
37     {
38     $OUT = '';
39    
40     - my $limit = ${'mysqld'}{OpenFilesLimit} || 0;
41     + my $limit = ${'mariadb'}{OpenFilesLimit} || 0;
42     return if $limit eq 0;
43    
44     $OUT .= "open_files_limit=$limit\n";
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed