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

Contents of /rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-mariadb1.patch

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

Revision 1.2 - (show annotations) (download)
Thu Mar 31 12:57:39 2016 UTC (8 years, 1 month 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-5_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-6_el7_sme, e-smith-mysql-2_6_0-19_el7_sme, e-smith-mysql-2_6_0-4_el7_sme, e-smith-mysql-2_6_0-7_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
Changes since 1.1: +2 -2 lines 
* Thu Mar 31 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
- new path for pid file with mariadb [SME: 9407]
- my.cnf : Innodb needs to be active for mariadb [SME: 9406]
1 diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/db/configuration/migrate/15innodb e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/15innodb
2 --- e-smith-mysql-2.6.0.old/root/etc/e-smith/db/configuration/migrate/15innodb 1969-12-31 19:00:00.000000000 -0500
3 +++ e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/15innodb 2016-03-31 07:03:46.001000000 -0400
4 @@ -0,0 +1,6 @@
5 +{
6 + # InnoDB is mandatory with mariadb
7 + my $a = $DB->get("mysqld") or return;
8 + return unless (exists $mysqld{'InnoDB'});
9 + $DB->get_prop_and_delete('mysqld', 'InnoDB');
10 +}
11 diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs
12 --- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs 2016-02-05 17:29:32.000000000 -0500
13 +++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs 2016-03-31 06:33:11.107000000 -0400
14 @@ -3,12 +3,12 @@
15 ( cat /home/e-smith/db/mysql/mysql.dump ;
16 cat /service/mysqld/set.password ) | mysql || exit 1
17 /usr/bin/mysql_upgrade
18 -P=$(cat /var/run/mysqld/mysqld.pid)
19 -/bin/rm /var/run/mysqld/mysqld.pid
20 +P=$(cat /var/run/mariadb/mariadb.pid)
21 +/bin/rm /var/run/mariadb/mariadb.pid
22 kill -TERM $P
23 for i in $(seq 1 20);
24 do
25 - if [ -f /var/run/mysqld/mysqld.pid ]
26 + if [ -f /var/run/mariadb/mariadb.pid ]
27 then
28 /bin/rm /home/e-smith/db/mysql/mysql.dump
29 exit 0
30 diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade
31 --- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade 2016-02-05 17:29:32.000000000 -0500
32 +++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade 2016-03-31 06:34:02.469000000 -0400
33 @@ -1,12 +1,12 @@
34 #!/bin/sh
35 /usr/bin/mysql_upgrade
36
37 -P=$(cat /var/run/mysqld/mysqld.pid)
38 -/bin/rm /var/run/mysqld/mysqld.pid
39 +P=$(cat /var/run/mariadb/mariadb.pid)
40 +/bin/rm /var/run/mariadb/mariadb.pid
41 kill -TERM $P
42 for i in $(seq 1 20);
43 do
44 - if [ -f /var/run/mysqld/mysqld.pid ]
45 + if [ -f /var/run/mariadb/mariadb.pid ]
46 then
47 exit 0
48 fi
49 diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/006pid-file e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/006pid-file
50 --- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/006pid-file 2003-12-18 17:10:32.000000000 -0500
51 +++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/006pid-file 2016-03-31 06:47:36.487000000 -0400
52 @@ -1 +1 @@
53 -pid-file=/var/run/mysqld/mysqld.pid
54 +pid-file=/var/run/mariadb/mariadb.pid
55 diff -Nur 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
56 --- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/my.cnf/009innodb 2016-02-05 17:29:31.000000000 -0500
57 +++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/my.cnf/009innodb 2016-03-31 06:47:05.763000000 -0400
58 @@ -1,7 +1,4 @@
59 {
60 - my $innodb = $mysqld{InnoDB} || 'disabled';
61 -
62 - return "skip-innodb" unless $innodb eq 'enabled';
63
64 # innodb is enabled. We'll use the MySQL-AB-recommended innodb
65 # defaults for small to medium sites, from the my-medium.cnf file
66 @@ -10,9 +7,9 @@
67 $OUT .= "innodb_data_file_path = ibdata1:10M:autoextend\n";
68 $OUT .= "innodb_log_group_home_dir = /var/lib/mysql/\n";
69 $OUT .= "innodb_buffer_pool_size = 16M\n";
70 - $OUT .= "innodb_additional_mem_pool_size = 2M\n";
71 - $OUT .= "innodb_log_file_size = 5M\n";
72 + $OUT .= "innodb_additional_mem_pool_size = 250M\n";
73 + $OUT .= "innodb_log_file_size = 125M\n";
74 $OUT .= "innodb_log_buffer_size = 8M\n";
75 $OUT .= "innodb_flush_log_at_trx_commit = 1\n";
76 - $OUT .= "innodb_lock_wait_timeout = 50\n";
77 + $OUT .= "innodb_lock_wait_timeout = 120\n";
78 }
79 diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/d e-smith-mysql-2.6.0/root/var/service/mysqld/control/d
80 --- e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/d 2005-04-10 22:51:01.000000000 -0400
81 +++ e-smith-mysql-2.6.0/root/var/service/mysqld/control/d 2016-03-31 07:16:21.593000000 -0400
82 @@ -1,3 +1,3 @@
83 #! /bin/sh
84
85 -exec kill -TERM $(cat /var/run/mysqld/mysqld.pid)
86 +exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
87 diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/i e-smith-mysql-2.6.0/root/var/service/mysqld/control/i
88 --- e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/i 2005-04-10 22:51:01.000000000 -0400
89 +++ e-smith-mysql-2.6.0/root/var/service/mysqld/control/i 2016-03-31 07:16:40.472000000 -0400
90 @@ -1,3 +1,3 @@
91 #! /bin/sh
92
93 -exec kill -INT $(cat /var/run/mysqld/mysqld.pid)
94 +exec kill -INT $(cat /var/run/mariadb/mariadb.pid)
95 diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/q e-smith-mysql-2.6.0/root/var/service/mysqld/control/q
96 --- e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/q 2005-04-10 22:51:01.000000000 -0400
97 +++ e-smith-mysql-2.6.0/root/var/service/mysqld/control/q 2016-03-31 07:17:00.956000000 -0400
98 @@ -1,3 +1,3 @@
99 #! /bin/sh
100
101 -exec kill -QUIT $(cat /var/run/mysqld/mysqld.pid)
102 +exec kill -QUIT $(cat /var/run/mariadb/mariadb.pid)
103 diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/t e-smith-mysql-2.6.0/root/var/service/mysqld/control/t
104 --- e-smith-mysql-2.6.0.old/root/var/service/mysqld/control/t 2005-04-10 22:51:01.000000000 -0400
105 +++ e-smith-mysql-2.6.0/root/var/service/mysqld/control/t 2016-03-31 07:17:19.081000000 -0400
106 @@ -1,3 +1,3 @@
107 #! /bin/sh
108
109 -exec kill -TERM $(cat /var/run/mysqld/mysqld.pid)
110 +exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
111 diff -Nur e-smith-mysql-2.6.0.old/root/var/service/mysqld/run e-smith-mysql-2.6.0/root/var/service/mysqld/run
112 --- e-smith-mysql-2.6.0.old/root/var/service/mysqld/run 2008-10-06 10:29:16.000000000 -0400
113 +++ e-smith-mysql-2.6.0/root/var/service/mysqld/run 2016-03-31 07:08:39.644000000 -0400
114 @@ -16,4 +16,4 @@
115 --basedir=/usr \
116 --datadir=/var/lib/mysql \
117 --user=mysql \
118 - --pid-file=/var/run/mysqld/mysqld.pid
119 + --pid-file=/var/run/mariadb/mariadb.pid
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed