/[smeserver]/rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch
ViewVC logotype

Diff of /rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch

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

Revision 1.6 by jpp, Mon Mar 14 05:05:33 2022 UTC Revision 1.10 by jpp, Wed Mar 16 20:10:05 2022 UTC
# Line 112  diff -Nur --no-dereference smeserver-mys Line 112  diff -Nur --no-dereference smeserver-mys
112  +PERMS=0400  +PERMS=0400
113  +UID="root"  +UID="root"
114  +GID="root"  +GID="root"
115  diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize  diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-post smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-post
116  --- smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize      2022-03-14 00:10:47.160000000 -0400  --- smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-post    1969-12-31 19:00:00.000000000 -0500
117  +++ smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize  2022-03-14 01:01:42.194000000 -0400  +++ smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-post        2022-03-14 02:28:09.537000000 -0400
118  @@ -38,6 +38,8 @@  @@ -0,0 +1,18 @@
119       if [ !!!VER!!! -le  103 ]  +#!/bin/bash
120       then  +
121         /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password  +for i in $(seq 1 20);
122  +    else  +do
123  +     /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password2  +  if [ -S !!!SOCKET!!! ]
124       fi  +  then
125       # upgrade does not need to be run on a fresh datadir  +      /usr/bin/mysql!!!VER!!! < /var/lib/mysql/set.password2
126       #echo "5.7.24" >"$datadir/mysql_upgrade_info"  +      echo  "root password set"
127  @@ -53,6 +55,9 @@  +      exit 0
128      if [ !!!VER!!! -le  103 ]  +  fi
129      then  +  echo waiting for rh-mariadb105-mariadb to start to set root password
130        /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password  +  sleep 1
131  +   else  +done
132  +     /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password2  +echo  failed to set root password
133      fi  +# we fail silently, mariadb will still work, only issue is for phpmyadmin
134    +# and non socket access
135    +exit 0
136  +  +
137      exit 0  diff -Nur smeserver-mysql-2.7.0.old/rootscl/etc/e-smith/events/actions/mariadb_VER_-dump-tables smeserver-mysql-2.7.0/rootscl/etc/e-smith/events/actions/mariadb_VER_-dump-tables
138    --- smeserver-mysql-2.7.0.old/rootscl/etc/e-smith/events/actions/mariadb_VER_-dump-tables       2022-03-12 04:00:37.000000000 +0100
139    +++ smeserver-mysql-2.7.0/rootscl/etc/e-smith/events/actions/mariadb_VER_-dump-tables   2022-03-16 08:25:24.372541028 +0100
140    @@ -35,12 +35,12 @@
141            echo $message | /usr/bin/mail -s "error on backup of $db MariaDB !!!VER!!! database" admin
142         fi
143         message="$message \nThere was an error trying to dump database $db, please check for table errors in this db. Forcing a backup of the corrupted DB."
144    -    /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqldump --force --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mariadb!!!VER!!!/"$db"-failed.dump || message="$message \nFailed to force backup of corrupted db $db as $db-failed.dump" >&2
145    +    /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqldump --socket=!!!SOCKET!!! --force --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mariadb!!!VER!!!/"$db"-failed.dump || message="$message \nFailed to force backup of corrupted db $db as $db-failed.dump" >&2
146         if [ "$fixtables" = "enabled" ]; then
147            repair="failure"
148            message="$message \nTrying to auto-repair the db and do a backup after..."
149    -       /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqlcheck -s --auto-repair -c "$db"  &&  \
150    -       /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqldump --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mariadb!!!VER!!!/"$db".dump && repair="success"
151    +       /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqlcheck --socket=!!!SOCKET!!! -s --auto-repair -c "$db"  &&  \
152    +       /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqldump --socket=!!!SOCKET!!! --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mariadb!!!VER!!!/"$db".dump && repair="success"
153            message="$message \n => $repair"
154         fi
155         echo $message
156    @@ -52,7 +52,7 @@
157         echo "mysqld is disabled - no tables dumped" >&2
158         exit 0
159   fi   fi
160    -for db in $(/opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysql -BNre "show databases;"|egrep -vi "^information_schema$|^performance_schema$")
161    +for db in $(/opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysql --socket=!!!SOCKET!!! -BNre "show databases;"|egrep -vi "^information_schema$|^performance_schema$")
162     do
163    -    /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqldump --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mariadb!!!VER!!!/"$db".dump || onfailure $db
164    +    /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqldump --socket=!!!SOCKET!!! --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mariadb!!!VER!!!/"$db".dump || onfailure $db
165     done
166    diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service smeserver-mysql-2.7.0/rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service
167    --- smeserver-mysql-2.7.0.old/rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service    2022-03-16 16:01:25.209000000 -0400
168    +++ smeserver-mysql-2.7.0/rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service        2022-03-11 15:26:08.000000000 -0500
169    @@ -12,8 +12,8 @@
170     KillMode=process
171     GuessMainPID=no
172     RemainAfterExit=yes
173    +ExecStart=/sbin/e-smith/systemd/mariadb!!!VER!!!-mysql.init start
174    +ExecStop=/sbin/e-smith/systemd/mariadb!!!VER!!!-mysql.init stop
175    -ExecStart=/sbin/e-smith/systemd/mariadb!!!VER!!!-mariadb.init start
176    -ExecStop=/sbin/e-smith/systemd/mariadb!!!VER!!!-mariadb.init stop
177    
178     [Install]
179     WantedBy=sme-server.target

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed