diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables 2017-03-29 23:36:38.663000000 -0400 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables 2017-03-30 00:03:58.170000000 -0400 @@ -6,6 +6,7 @@ echo "mysqld is disabled - no tables restored" >&2 exit 0 fi +/bin/rm -f /home/e-smith/db/mysql57/information_schema.dump if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/user.frm ] then for db in $(ls /home/e-smith/db/mysql57/*.dump 2> /dev/null | grep -v '/mysql.dump') diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs 2017-03-29 23:36:38.663000000 -0400 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs 2017-03-30 00:02:23.810000000 -0400 @@ -2,12 +2,12 @@ ( cat /home/e-smith/db/mysql57/mysql.dump ; cat /service/mysql57-mysqld/set.password ) | /opt/rh/rh-mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock || exit 1 -P=$(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid) -/bin/rm /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid +P=$(cat /var/run/rh-mysql57-mysqld/mysqld.pid) +/bin/rm /var/run/rh-mysql57-mysqld/mysqld.pid kill -TERM $P for i in $(seq 1 20); do - if [ -f /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid ] + if [ -f /var/run/rh-mysql57-mysqld/mysqld.pid ] then /bin/rm /home/e-smith/db/mysql57/mysql.dump exit 0 diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables 2017-03-29 23:36:38.663000000 -0400 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables 2017-03-29 23:59:31.373000000 -0400 @@ -1,12 +1,12 @@ #!/bin/sh - -/opt/rh/rh-mysql57/root/usr/bin/mysql -f mysql < /usr/share/mysql/mysql_fix_privilege_tables.sql -P=$(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid) -/bin/rm /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid +# not in use currently +#/opt/rh/rh-mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock -f mysql < /opt/rh/rh-mysql57/root/usr/share/rh-mysql57-mysql/mysql_system_tables.sql +P=$(cat /var/run/rh-mysql57-mysqld/mysqld.pid) +/bin/rm /var/run/rh-mysql57-mysqld/mysqld.pid kill -TERM $P for i in $(seq 1 20); do - if [ -f /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid ] + if [ -f /var/run/rh-mysql57-mysqld/mysqld.pid ] then exit 0 fi