| 1 |
jpp |
1.1 |
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 |
| 2 |
|
|
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables 2017-03-29 23:36:38.663000000 -0400 |
| 3 |
|
|
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables 2017-03-30 00:03:58.170000000 -0400 |
| 4 |
|
|
@@ -6,6 +6,7 @@ |
| 5 |
|
|
echo "mysqld is disabled - no tables restored" >&2 |
| 6 |
|
|
exit 0 |
| 7 |
|
|
fi |
| 8 |
|
|
+/bin/rm -f /home/e-smith/db/mysql57/information_schema.dump |
| 9 |
|
|
if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/user.frm ] |
| 10 |
|
|
then |
| 11 |
|
|
for db in $(ls /home/e-smith/db/mysql57/*.dump 2> /dev/null | grep -v '/mysql.dump') |
| 12 |
|
|
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 |
| 13 |
|
|
--- 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 |
| 14 |
|
|
+++ 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 |
| 15 |
|
|
@@ -2,12 +2,12 @@ |
| 16 |
|
|
|
| 17 |
|
|
( cat /home/e-smith/db/mysql57/mysql.dump ; |
| 18 |
|
|
cat /service/mysql57-mysqld/set.password ) | /opt/rh/rh-mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock || exit 1 |
| 19 |
|
|
-P=$(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid) |
| 20 |
|
|
-/bin/rm /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid |
| 21 |
|
|
+P=$(cat /var/run/rh-mysql57-mysqld/mysqld.pid) |
| 22 |
|
|
+/bin/rm /var/run/rh-mysql57-mysqld/mysqld.pid |
| 23 |
|
|
kill -TERM $P |
| 24 |
|
|
for i in $(seq 1 20); |
| 25 |
|
|
do |
| 26 |
|
|
- if [ -f /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid ] |
| 27 |
|
|
+ if [ -f /var/run/rh-mysql57-mysqld/mysqld.pid ] |
| 28 |
|
|
then |
| 29 |
|
|
/bin/rm /home/e-smith/db/mysql57/mysql.dump |
| 30 |
|
|
exit 0 |
| 31 |
|
|
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 |
| 32 |
|
|
--- 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 |
| 33 |
|
|
+++ 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 |
| 34 |
|
|
@@ -1,12 +1,12 @@ |
| 35 |
|
|
#!/bin/sh |
| 36 |
|
|
- |
| 37 |
|
|
-/opt/rh/rh-mysql57/root/usr/bin/mysql -f mysql < /usr/share/mysql/mysql_fix_privilege_tables.sql |
| 38 |
|
|
-P=$(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid) |
| 39 |
|
|
-/bin/rm /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid |
| 40 |
|
|
+# not in use currently |
| 41 |
|
|
+#/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 |
| 42 |
|
|
+P=$(cat /var/run/rh-mysql57-mysqld/mysqld.pid) |
| 43 |
|
|
+/bin/rm /var/run/rh-mysql57-mysqld/mysqld.pid |
| 44 |
|
|
kill -TERM $P |
| 45 |
|
|
for i in $(seq 1 20); |
| 46 |
|
|
do |
| 47 |
|
|
- if [ -f /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid ] |
| 48 |
|
|
+ if [ -f /var/run/rh-mysql57-mysqld/mysqld.pid ] |
| 49 |
|
|
then |
| 50 |
|
|
exit 0 |
| 51 |
|
|
fi |
Parent Directory
| 
Revision Log
| 
Revision Graph
