[MediaWiki-commits] [Gerrit] Add page_restrictions to readlock in lockSearchindex - change (mediawiki/core)

2015-07-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add page_restrictions to readlock in lockSearchindex
..


Add page_restrictions to readlock in lockSearchindex

Bug: T86156
Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
(cherry picked from commit f50de5d93d8128784735954ed9eccf6f84a1b347)
---
M RELEASE-NOTES-1.25
M maintenance/Maintenance.php
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 6746224..309e07e 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -14,6 +14,8 @@
 * (T102522) Using an extension.json or skin.json file which has
   a manifest_version property for 1.26 compatability will no longer
   trigger warnings.
+* (T86156) Running updateSearchIndex.php will not throw an error as
+  page_restrictions has been added to the locked table list.
 
 === Changes since 1.25 ===
 * (T100351) Fix syntax errors in extension.json of ConfirmEdit extension
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 923c5b4..5dafdfc 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1097,7 +1097,7 @@
 */
private function lockSearchindex( $db ) {
$write = array( 'searchindex' );
-   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user' );
+   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user', 'page_restrictions' );
$db-lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/219491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add page_restrictions to readlock in lockSearchindex - change (mediawiki/core)

2015-06-19 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219491

Change subject: Add page_restrictions to readlock in lockSearchindex
..

Add page_restrictions to readlock in lockSearchindex

Bug: T86156
Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
(cherry picked from commit f50de5d93d8128784735954ed9eccf6f84a1b347)
---
M maintenance/Maintenance.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/219491/1

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 923c5b4..5dafdfc 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1097,7 +1097,7 @@
 */
private function lockSearchindex( $db ) {
$write = array( 'searchindex' );
-   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user' );
+   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user', 'page_restrictions' );
$db-lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/219491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add page_restrictions to readlock in lockSearchindex - change (mediawiki/core)

2015-04-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add page_restrictions to readlock in lockSearchindex
..


Add page_restrictions to readlock in lockSearchindex

Bug: T86156
Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
---
M maintenance/Maintenance.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index af14bb3..bde34d3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1096,7 +1096,7 @@
 */
private function lockSearchindex( $db ) {
$write = array( 'searchindex' );
-   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user' );
+   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user', 'page_restrictions' );
$db-lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/192710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add page_restrictions to readlock in lockSearchindex - change (mediawiki/core)

2015-02-24 Thread Physikerwelt (Code Review) 
Physikerwelt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/192710

Change subject: Add page_restrictions to readlock in lockSearchindex
..

Add page_restrictions to readlock in lockSearchindex

Bug: T86156
Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
---
M maintenance/Maintenance.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/192710/1

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index af14bb3..bde34d3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1096,7 +1096,7 @@
 */
private function lockSearchindex( $db ) {
$write = array( 'searchindex' );
-   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user' );
+   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user', 'page_restrictions' );
$db-lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/192710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits