Merge branch 'QA_4_5'

This commit is contained in:
Marc Delisle 2015-09-07 15:16:10 -04:00
commit 9a20bdaf39

View File

@ -162,10 +162,11 @@ class ImportSql extends ImportPlugin
}
// Extracting remaining statements.
while ((!$error) && (!$timeout_passed)
&& ($statement = $bq->extract(true))
) {
PMA_importRunQuery($statement, $statement, false, $sql_data);
while ((!$error) && (!$timeout_passed) && (!empty($bq->query))) {
$statement = $bq->extract(true);
if (!empty($statement)) {
PMA_importRunQuery($statement, $statement, false, $sql_data);
}
}
// Finishing.