File tree 4 files changed +13
-9
lines changed
4 files changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -97,15 +97,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
97
97
98
98
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket=" ${SOCKET} " )
99
99
100
- for i in {30 ..0}; do
100
+ for i in {${MYSQL_START_TIMEOUT :- 30} ..0}; do
101
101
if echo ' SELECT 1' | " ${mysql[@]} " & > /dev/null; then
102
102
break
103
103
fi
104
104
echo ' MySQL init process in progress...'
105
105
sleep 1
106
106
done
107
107
if [ " $i " = 0 ]; then
108
- echo >&2 ' MySQL init process failed.'
108
+ echo >&2 ' MySQL init process failed. Cleaning up..'
109
+ rm -rf $DATADIR /mysql
109
110
exit 1
110
111
fi
111
112
Original file line number Diff line number Diff line change @@ -97,15 +97,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
97
97
98
98
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket=" ${SOCKET} " )
99
99
100
- for i in {30..0} ; do
100
+ for i in $( seq ${MYSQL_START_TIMEOUT :- 30} -1 0 ) ; do
101
101
if echo ' SELECT 1' | " ${mysql[@]} " & > /dev/null; then
102
102
break
103
103
fi
104
- echo ' MySQL init process in progress...'
104
+ echo " MySQL init process in progress..."
105
105
sleep 1
106
106
done
107
107
if [ " $i " = 0 ]; then
108
- echo >&2 ' MySQL init process failed.'
108
+ echo >&2 ' MySQL init process failed. Cleaning up..'
109
+ rm -rf $DATADIR /mysql
109
110
exit 1
110
111
fi
111
112
Original file line number Diff line number Diff line change @@ -104,15 +104,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
104
104
105
105
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket=" ${SOCKET} " )
106
106
107
- for i in {30 ..0}; do
107
+ for i in {${MYSQL_START_TIMEOUT :- 30} ..0}; do
108
108
if echo ' SELECT 1' | " ${mysql[@]} " & > /dev/null; then
109
109
break
110
110
fi
111
111
echo ' MySQL init process in progress...'
112
112
sleep 1
113
113
done
114
114
if [ " $i " = 0 ]; then
115
- echo >&2 ' MySQL init process failed.'
115
+ echo >&2 ' MySQL init process failed. Cleaning up..'
116
+ rm -rf $DATADIR /mysql
116
117
exit 1
117
118
fi
118
119
Original file line number Diff line number Diff line change @@ -104,15 +104,16 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
104
104
105
105
mysql=( mysql --protocol=socket -uroot -hlocalhost --socket=" ${SOCKET} " )
106
106
107
- for i in {30 ..0}; do
107
+ for i in {${MYSQL_START_TIMEOUT :- 30} ..0}; do
108
108
if echo ' SELECT 1' | " ${mysql[@]} " & > /dev/null; then
109
109
break
110
110
fi
111
111
echo ' MySQL init process in progress...'
112
112
sleep 1
113
113
done
114
114
if [ " $i " = 0 ]; then
115
- echo >&2 ' MySQL init process failed.'
115
+ echo >&2 ' MySQL init process failed. Cleaning up..'
116
+ rm -rf $DATADIR /mysql
116
117
exit 1
117
118
fi
118
119
You can’t perform that action at this time.
0 commit comments