|
183 | 183 | echo "Running: mysql main db restore from file: " . $db_filename . PHP_EOL; |
184 | 184 | DebMes("Running: mysql main db restore from file: " . $db_filename); |
185 | 185 | $mysql_path = (substr(php_uname(), 0, 7) == "Windows") ? SERVER_ROOT . "/server/mysql/bin/mysql" : 'mysql'; |
186 | | - $mysqlParam = " -u " . DB_USER; |
187 | | - if (DB_PASSWORD != '') $mysqlParam .= " -p" . DB_PASSWORD; |
| 186 | + $mysqlParam = " -h " . DB_HOST; |
| 187 | + $mysqlParam .= " -u " . DB_USER; |
| 188 | + if (DB_PASSWORD != '') $mysqlParam .= " -p'" . DB_PASSWORD."'"; |
188 | 189 | $mysqlParam .= " " . DB_NAME . " <" . $db_filename; |
189 | 190 | exec($mysql_path . $mysqlParam); |
190 | 191 |
|
191 | 192 | if (file_exists($db_history_filename)) { |
192 | 193 | echo "Running: mysql history db restore from file: " . $db_history_filename . PHP_EOL; |
193 | 194 | DebMes("Running: mysql history db restore from file: " . $db_history_filename); |
194 | 195 | $mysql_path = (substr(php_uname(), 0, 7) == "Windows") ? SERVER_ROOT . "/server/mysql/bin/mysql" : 'mysql'; |
195 | | - $mysqlParam = " -u " . DB_USER; |
196 | | - if (DB_PASSWORD != '') $mysqlParam .= " -p" . DB_PASSWORD; |
| 196 | + $mysqlParam = " -h " . DB_HOST; |
| 197 | + $mysqlParam .= " -u " . DB_USER; |
| 198 | + if (DB_PASSWORD != '') $mysqlParam .= " -p'" . DB_PASSWORD."'"; |
197 | 199 | $mysqlParam .= " " . DB_NAME . " <" . $db_history_filename; |
198 | 200 | exec($mysql_path . $mysqlParam); |
199 | 201 | } |
200 | 202 | } |
201 | 203 |
|
| 204 | + |
202 | 205 | include_once("./load_settings.php"); // |
203 | 206 |
|
204 | 207 | echo "Checking modules.\n"; |
|
0 commit comments