Merge "alter sql.php prompt on line continuation"

diff --cc maintenance/sql.php
index a0277b2,f970677..72e6775
--- 1/maintenance/sql.php
--- 2/maintenance/sql.php
+++ b/maintenance/sql.php
@@@ -80,10 -86,10 +88,11 @@@ class MwSql extends Maintenance 
                        try{
                                $res = $dbw->query( $wholeLine );
                                $this->sqlPrintResult( $res, $dbw );
+                               $prompt    = $newPrompt;
                                $wholeLine = '';
                        } catch (DBQueryError $e) {
 -                              $this->error( $e, true );
 +                              $doDie = ! Maintenance::posix_isatty( 0 );
 +                              $this->error( $e, $doDie );
                        }
                }
        }