<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">yoku0825 <yoku0****@gmail*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2015-10-30 11:00:08 +0900 (Fri, 30 Oct 2015)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8">9f001e1cb8044383c15a9796ba3579c89e05e2a8</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Merge</dt>
<dd style="margin-left: 8.5em">
<ul>
<li>Merged <a href="https://github.com/mroonga/mroonga/commit/919a689">919a689</a>: Merge pull request <a href="https://github.com/mroonga/mroonga/issues/79">#79</a> from yoku0825/fix_mysql57_installation_2</li>
</ul>
</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Fix to Not using MYSQL_PWD</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8c">packages/rpm/centos/mysql57-community-mroonga.spec.in</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: packages/rpm/centos/mysql57-community-mroonga.spec.in (+9 -5)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL106">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL107">107</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL108">108</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL109">109</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL110">110</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL111">111</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL112">112</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL113">113</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL145">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL146">146</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL147">147</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL148">148</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL149">149</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL150">150</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL151">151</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL152">152</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL153">153</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL156">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL157">157</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL158">158</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL159">159</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL160">160</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL161">161</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL162">162</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL163">163</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cL164">164</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR106">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR107">107</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR108">108</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR109">109</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR110">110</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR111">111</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR112">112</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR113">113</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR145">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR146">146</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR147">147</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR148">148</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR149">149</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR150">150</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR151">151</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR152">152</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR153">153</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR154">154</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR155">155</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR156">156</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR159">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR160">160</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR161">161</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR162">162</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR163">163</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR164">164</a></span>
<span class="diff-line-number-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR165">165</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR166">166</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR167">167</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8#diff-3180002f9f34701e0719168f0e15df8cR168">168</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -107,7 +107,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">rm -rf $RPM_BUILD_ROOT</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if ! /sbin/service mysqld status > /dev/null; then</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> /sbin/service mysqld start</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> stop_after_installation=1</span>
<span class="diff-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre">- <span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">exp</span>ort<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000"> MYSQL</span>_<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">PWD</span>=`awk '/root@localhost/{print $NF}' /var/log/mysqld.log`</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ <span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">auto_g</span>e<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">nerated_</span>p<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">assw</span>or<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">d</span>=`awk '/root@localhost/{print $NF}' /var/log/mysqld.log`</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> else</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> stop_after_installation=0</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> fi</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -146,8 +146,11 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">if [ "$1" = 2 ] ; then</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> fi</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if [ -n "$password_option" -a "$stop_after_installation" = "1" ]; then</span>
<span class="diff-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre">- $mysql_command -u root --connect-expired-password -e "ALTER USER user() IDENTIFIED BY '$MYSQL_PWD'"</span>
<span class="diff-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre">- password_option=""</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ sql="ALTER USER user() IDENTIFIED BY '$auto_generated_password'"</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ command="$mysql_command -u root -p'$auto_generated_password' \</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ --connect-expired-password -e \"$sql\""</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ eval $command</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ password_option="-p'$auto_generated_password'"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> fi</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> command="$mysql_command -u root $password_option < ${install_sql}"</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -157,8 +160,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">eval $command || \</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> echo " $command")</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if [ "$stop_after_installation" = "1" ]; then</span>
<span class="diff-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre">- $mysql_command -u root -e "ALTER USER root@localhost PASSWORD EXPIRE"</span>
<span class="diff-deleted" style="background-color: #ffdddd; color: #000000; display: block; white-space: pre">- unset MYSQL_PWD</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ sql="ALTER USER root@localhost PASSWORD EXPIRE"</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ command="$mysql_command -u root -p'$auto_generated_password' -e \"$sql\""</span>
<span class="diff-added" style="background-color: #dbffdb; color: #000000; display: block; white-space: pre">+ eval $command</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> /sbin/service mysqld stop</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> fi</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>