From: Demon <chadh@wikimedia.org>
Date: Thu, 25 Oct 2012 13:35:32 +0000 (+0000)
Subject: Merge "alter sql.php prompt on line continuation"
X-Git-Tag: 1.31.0-rc.0~21867
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=63fe60368c0e7a6359acce3dbbce912068dec0a9;p=lhc%2Fweb%2Fwiklou.git

Merge "alter sql.php prompt on line continuation"
---

63fe60368c0e7a6359acce3dbbce912068dec0a9
diff --cc maintenance/sql.php
index a0277b2d19,f970677b1f..72e6775b7a
--- a/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 );
  			}
  		}
  	}