dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c5462bc
b1a524f
)
Merge "alter sql.php prompt on line continuation"
author
Demon
<chadh@wikimedia.org>
Thu, 25 Oct 2012 13:35:32 +0000
(13:35 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Thu, 25 Oct 2012 13:35:32 +0000
(13:35 +0000)
1
2
maintenance/sql.php
patch
|
diff1
|
diff2
|
blob
|
history
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 );
}
}
}