From 335c06f7b647c3ebe9f137edc12f22c34405560f Mon Sep 17 00:00:00 2001
From: Amir Sarabadani <Ladsgroup@gmail.com>
Date: Wed, 10 Mar 2021 14:26:59 +0100
Subject: [PATCH] Drop MysqlUpdater::doWatchlistNull() and its related sql file

It was introduced in 1.6 which we don't support direct upgrade from
anymore. Also it has been removed from update.php list and it's not
mentioned anymore.

Bug: T272199
Change-Id: I8d9565fe035faf96033dc207515b8ec21bca9fe6
---
 includes/installer/MysqlUpdater.php           | 22 -------------------
 maintenance/archives/patch-watchlist-null.sql |  9 --------
 2 files changed, 31 deletions(-)
 delete mode 100644 maintenance/archives/patch-watchlist-null.sql

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 0124d0bcb65..7bc44f197fc 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -427,28 +427,6 @@ class MysqlUpdater extends DatabaseUpdater {
 		}
 	}
 
-	/**
-	 * Make sure wl_notificationtimestamp can be NULL,
-	 * and update old broken items.
-	 */
-	protected function doWatchlistNull() {
-		$info = $this->db->fieldInfo( 'watchlist', 'wl_notificationtimestamp' );
-		if ( !$info ) {
-			return;
-		}
-		if ( $info->isNullable() ) {
-			$this->output( "...wl_notificationtimestamp is already nullable.\n" );
-
-			return;
-		}
-
-		$this->applyPatch(
-			'patch-watchlist-null.sql',
-			false,
-			'Making wl_notificationtimestamp nullable'
-		);
-	}
-
 	/**
 	 * Set page_random field to a random value where it is equals to 0.
 	 *
diff --git a/maintenance/archives/patch-watchlist-null.sql b/maintenance/archives/patch-watchlist-null.sql
deleted file mode 100644
index d4869a0254f..00000000000
--- a/maintenance/archives/patch-watchlist-null.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Set up wl_notificationtimestamp with NULL support.
--- 2005-08-17
-
-ALTER TABLE /*$wgDBprefix*/watchlist
-  CHANGE wl_notificationtimestamp wl_notificationtimestamp varbinary(14);
-
-UPDATE /*$wgDBprefix*/watchlist
-  SET wl_notificationtimestamp=NULL
-  WHERE wl_notificationtimestamp='0';