From 0a93752af67fe6d31ba279c11e376ce5c145a4c3 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 22 Apr 2007 14:04:06 +0000
Subject: [PATCH] * Removed mysql5 SQL files, obviously we're collectively
 incapable of keeping them up to date. They were littered with errors. The
 only deliberate difference appears to be the table character set, which can
 be adjusted programatically using a variable. * Added table option variable
 to the SQL patch files, so now upgrading a non-standard schema won't leave
 your database horribly corrupted. * Added sql.php, for sourcing SQL files
 with MediaWiki variable substitution. * Disable MySQL's strict mode at
 session start for MySQL 4.1+, to avoid the various problems that occur when
 it is on.

---
 config/index.php                              |   75 +-
 includes/Database.php                         |   42 +-
 includes/DefaultSettings.php                  |    5 +
 maintenance/archives/patch-categorylinks.sql  |    2 +-
 maintenance/archives/patch-externallinks.sql  |    2 +-
 maintenance/archives/patch-filearchive.sql    |    2 +-
 maintenance/archives/patch-interwiki.sql      |    2 +-
 maintenance/archives/patch-ipb_anon_only.sql  |    2 +-
 maintenance/archives/patch-job.sql            |    2 +-
 maintenance/archives/patch-langlinks.sql      |    2 +-
 maintenance/archives/patch-linkscc.sql        |    2 +-
 maintenance/archives/patch-linktables.sql     |    8 +-
 maintenance/archives/patch-logging.sql        |    2 +-
 maintenance/archives/patch-math.sql           |    2 +-
 maintenance/archives/patch-objectcache.sql    |    2 +-
 .../archives/patch-page_restrictions.sql      |    2 +-
 maintenance/archives/patch-pagelinks.sql      |    2 +-
 maintenance/archives/patch-parsercache.sql    |    2 +-
 maintenance/archives/patch-querycache.sql     |    2 +-
 maintenance/archives/patch-querycacheinfo.sql |    2 +-
 maintenance/archives/patch-querycachetwo.sql  |    2 +-
 maintenance/archives/patch-redirect.sql       |    2 +-
 maintenance/archives/patch-templatelinks.sql  |    2 +-
 maintenance/archives/patch-transcache.sql     |    2 +-
 maintenance/archives/patch-user_groups.sql    |    2 +-
 maintenance/archives/patch-user_rights.sql    |    2 +-
 maintenance/archives/patch-userlevels.sql     |    4 +-
 maintenance/archives/patch-validate.sql       |    2 +-
 maintenance/mysql5/tables-binary.sql          | 1158 -----------------
 maintenance/mysql5/tables.sql                 | 1149 ----------------
 maintenance/sql.php                           |   67 +
 maintenance/tables.sql                        |   64 +-
 32 files changed, 221 insertions(+), 2397 deletions(-)
 delete mode 100644 maintenance/mysql5/tables-binary.sql
 delete mode 100644 maintenance/mysql5/tables.sql
 create mode 100644 maintenance/sql.php

diff --git a/config/index.php b/config/index.php
index b392a6d7c2..e1ec6acaed 100644
--- a/config/index.php
+++ b/config/index.php
@@ -226,6 +226,26 @@ class ConfigData {
 	function getSitename() { return $this->getEncoded( $this->Sitename ); }
 	function getSysopName() { return $this->getEncoded( $this->SysopName ); }
 	function getSysopPass() { return $this->getEncoded( $this->SysopPass ); }
+
+	function setSchema( $schema ) {
+		$this->DBschema = $schema;
+		switch ( $this->DBschema ) {
+			case 'mysql5':
+				$this->DBTableOptions = 'ENGINE=InnoDB, DEFAULT CHARSET=utf8';
+				$this->DBmysql5 = 'true';
+				break;
+			case 'mysql5-binary':
+				$this->DBTableOptions = 'ENGINE=InnoDB, DEFAULT CHARSET=binary';
+				$this->DBmysql5 = 'true';
+				break;
+			default:
+				$this->DBTableOptions = 'TYPE=InnoDB';
+				$this->DBmysql5 = 'false';
+		}
+		# Set the global for use during install
+		global $wgDBTableOptions;
+		$wgDBTableOptions = $this->DBTableOptions;
+	}
 }
 
 ?>
@@ -522,10 +542,7 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
 
 	## MySQL specific:
 	$conf->DBprefix     = importPost( "DBprefix" );
-	$conf->DBschema     = importPost( "DBschema", "mysql4" );
-	$conf->DBmysql5     = ($conf->DBschema == "mysql5" ||
-	                       $conf->DBschema == "mysql5-binary")
-	                       ? "true" : "false";
+	$conf->setSchema( importPost( "DBschema", "mysql4" ) );
 	$conf->LanguageCode = importPost( "LanguageCode", "en" );
 
 	## Postgres specific:
@@ -813,6 +830,32 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 		if( $wgDatabase->tableExists( "cur" ) || $wgDatabase->tableExists( "revision" ) ) {
 			print "<li>There are already MediaWiki tables in this database. Checking if updates are needed...</li>\n";
 
+			# Determine existing default character set
+			if ( $wgDatabase->tableExists( "revision" ) ) {
+				$revision = $wgDatabase->escapeLike( $conf->DBprefix . 'revision' );
+				$res = $wgDatabase->query( "SHOW TABLE STATUS LIKE '$revision'" );
+				$row = $wgDatabase->fetchObject( $res );
+				if ( !$row ) {
+					echo "<li>SHOW TABLE STATUS query failed!</li>\n";
+					$existingSchema = false;
+				} elseif ( preg_match( '/^latin1/', $row->Collation ) ) {
+					$existingSchema = 'mysql4';
+				} elseif ( preg_match( '/^utf8/', $row->Collation ) ) {
+					$existingSchema = 'mysql5';
+				} elseif ( preg_match( '/^binary/', $row->Collation ) ) {
+					$existingSchema = 'mysql5-binary';
+				} else {
+					$existingSchema = false;
+					echo "<li><strong>Warning:</strong> Unrecognised existing collation</li>\n";
+				}
+				if ( $existingSchema && $existingSchema != $conf->DBschema ) {
+					print "<li><strong>Warning:</strong> you requested the {$conf->DBschema} schema, " .
+						"but the existing database has the $existingSchema schema. This upgrade script ". 
+						"can't convert it, so it will remain $existingSchema.</li>\n";
+					$conf->setSchema( $existingSchema );
+				}
+			}
+
 			# Create user if required (todo: other databases)
 			if ( $conf->Root && $conf->DBtype == 'mysql') {
 				$conn = $dbc->newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
@@ -828,33 +871,18 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 					dbsource( "../maintenance/users.sql", $wgDatabase );
 				}
 			}
-			print "<pre>\n";
+			print "</ul><pre>\n";
 			chdir( ".." );
 			flush();
 			do_all_updates();
 			chdir( "config" );
 			print "</pre>\n";
-			print "<li>Finished update checks.</li>\n";
+			print "<ul><li>Finished update checks.</li>\n";
 		} else {
 			# FIXME: Check for errors
 			print "<li>Creating tables...";
 			if ($conf->DBtype == 'mysql') {
-				switch( $conf->DBschema ) {
-				case "mysql4":
-					print " using MySQL 4 table defs...";
-					dbsource( "../maintenance/tables.sql", $wgDatabase );
-					break;
-				case "mysql5":
-					print " using MySQL 5 UTF-8 table defs...";
-					dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase );
-					break;
-				case "mysql5-binary":
-					print " using MySQL 5 binary table defs...";
-					dbsource( "../maintenance/mysql5/tables-binary.sql", $wgDatabase );
-					break;
-				default:
-					dieout( " <b>invalid schema selection!</b></li>" );
-				}
+				dbsource( "../maintenance/tables.sql", $wgDatabase );
 				dbsource( "../maintenance/interwiki.sql", $wgDatabase );
 			} else if ($conf->DBtype == 'postgres') {
 				$wgDatabase->setup_database();
@@ -1431,6 +1459,9 @@ if ( \$wgCommandLineMode ) {
 \$wgDBport           = \"{$slconf['DBport']}\";
 \$wgDBprefix         = \"{$slconf['DBprefix']}\";
 
+# MySQL table options to use during installation or update
+\$wgDBTableOptions   = \"{$slconf['DBTableOptions']}\";
+
 # Schemas for Postgres
 \$wgDBmwschema       = \"{$slconf['DBmwschema']}\";
 \$wgDBts2schema      = \"{$slconf['DBts2schema']}\";
diff --git a/includes/Database.php b/includes/Database.php
index f2042c7455..4dab26ca1c 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -610,12 +610,19 @@ class Database {
 		}
 
 		if ( $success ) {
-			global $wgDBmysql5;
-			if( $wgDBmysql5 ) {
+			$version = $this->getServerVersion();
+			if ( version_compare( $version, '4.1' ) >= 0 ) {
 				// Tell the server we're communicating with it in UTF-8.
 				// This may engage various charset conversions.
-				$this->query( 'SET NAMES utf8' );
+				global $wgDBmysql5;
+				if( $wgDBmysql5 ) {
+					$this->query( 'SET NAMES utf8', __METHOD__ );
+				}
+				// Turn off strict mode
+				$this->query( "SET sql_mode = ''", __METHOD__ );
 			}
+
+			// Turn off strict mode if it is on
 		} else {
 			$this->reportConnectionError();
 		}
@@ -2098,18 +2105,36 @@ class Database {
 	/**
 	 * Read and execute SQL commands from a file.
 	 * Returns true on success, error string on failure
+	 * @param string $filename File name to open
+	 * @param callback $lineCallback Optional function called before reading each line
+	 * @param callback $resultCallback Optional function called for each MySQL result
 	 */
-	function sourceFile( $filename ) {
+	function sourceFile( $filename, $lineCallback = false, $resultCallback = false ) {
 		$fp = fopen( $filename, 'r' );
 		if ( false === $fp ) {
 			return "Could not open \"{$filename}\".\n";
 		}
+		$error = $this->sourceStream( $fp, $lineCallback, $resultCallback );
+		fclose( $fp );
+		return $error;
+	}
 
+	/**
+	 * Read and execute commands from an open file handle
+	 * Returns true on success, error string on failure
+	 * @param string $fp File handle
+	 * @param callback $lineCallback Optional function called before reading each line
+	 * @param callback $resultCallback Optional function called for each MySQL result
+	 */
+	function sourceStream( $fp, $lineCallback = false, $resultCallback = false ) {
 		$cmd = "";
 		$done = false;
 		$dollarquote = false;
 
 		while ( ! feof( $fp ) ) {
+			if ( $lineCallback ) {
+				call_user_func( $lineCallback );
+			}
 			$line = trim( fgets( $fp, 1024 ) );
 			$sl = strlen( $line ) - 1;
 
@@ -2139,7 +2164,10 @@ class Database {
 			if ( $done ) {
 				$cmd = str_replace(';;', ";", $cmd);
 				$cmd = $this->replaceVars( $cmd );
-				$res = $this->query( $cmd, 'dbsource', true );
+				$res = $this->query( $cmd, __METHOD__, true );
+				if ( $resultCallback ) {
+					call_user_func( $resultCallback, $this->resultObject( $res ) );
+				}
 
 				if ( false === $res ) {
 					$err = $this->lastError();
@@ -2150,10 +2178,10 @@ class Database {
 				$done = false;
 			}
 		}
-		fclose( $fp );
 		return true;
 	}
 
+
 	/**
 	 * Replace variables in sourced SQL
 	 */
@@ -2161,7 +2189,7 @@ class Database {
 		$varnames = array(
 			'wgDBserver', 'wgDBname', 'wgDBintlname', 'wgDBuser',
 			'wgDBpassword', 'wgDBsqluser', 'wgDBsqlpassword',
-			'wgDBadminuser', 'wgDBadminpassword',
+			'wgDBadminuser', 'wgDBadminpassword', 'wgDBTableOptions',
 		);
 
 		// Ordinary variables
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 54a2686c70..cf5740978f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -505,8 +505,12 @@ $wgDBtype           = "mysql";
 $wgSearchType	    = null;
 /** Table name prefix */
 $wgDBprefix         = '';
+/** MySQL table options to use during installation or update */
+$wgDBTableOptions = 'TYPE=InnoDB';
+
 /**#@-*/
 
+
 /** Live high performance sites should disable this - some checks acquire giant mysql locks */
 $wgCheckDBSchema = true;
 
@@ -1168,6 +1172,7 @@ $wgEnotifUserTalk		= false;	# UPO
 $wgEnotifRevealEditorAddress	= false;	# UPO; reply-to address may be filled with page editor's address (if user allowed this in the preferences)
 $wgEnotifMinorEdits		= true;	# UPO; false: "minor edits" on pages do not trigger notification mails.
 #							# Attention: _every_ change on a user_talk page trigger a notification mail (if the user is not yet notified)
+$wgUsersNotifedOnAllChanges = array();
 
 /** Show watching users in recent changes, watchlist and page history views */
 $wgRCShowWatchingUsers 				= false; # UPO
diff --git a/maintenance/archives/patch-categorylinks.sql b/maintenance/archives/patch-categorylinks.sql
index 53c82fc0db..c5eb396eee 100644
--- a/maintenance/archives/patch-categorylinks.sql
+++ b/maintenance/archives/patch-categorylinks.sql
@@ -36,4 +36,4 @@ CREATE TABLE /*$wgDBprefix*/categorylinks (
   -- Not really used?
   KEY cl_timestamp(cl_to,cl_timestamp)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-externallinks.sql b/maintenance/archives/patch-externallinks.sql
index 52fb5bae10..0a4768ca5e 100644
--- a/maintenance/archives/patch-externallinks.sql
+++ b/maintenance/archives/patch-externallinks.sql
@@ -9,5 +9,5 @@ CREATE TABLE /*$wgDBprefix*/externallinks (
   KEY (el_from, el_to(40)),
   KEY (el_to(60), el_from),
   KEY (el_index(60))
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
diff --git a/maintenance/archives/patch-filearchive.sql b/maintenance/archives/patch-filearchive.sql
index cc50f2ae12..71f8a5ebb0 100644
--- a/maintenance/archives/patch-filearchive.sql
+++ b/maintenance/archives/patch-filearchive.sql
@@ -48,4 +48,4 @@ CREATE TABLE /*$wgDBprefix*/filearchive (
   INDEX (fa_deleted_timestamp),              -- sort by deletion time
   INDEX (fa_deleted_user)                    -- sort by deleter
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-interwiki.sql b/maintenance/archives/patch-interwiki.sql
index 90b162ef3d..3efdac8b3c 100644
--- a/maintenance/archives/patch-interwiki.sql
+++ b/maintenance/archives/patch-interwiki.sql
@@ -17,4 +17,4 @@ CREATE TABLE /*$wgDBprefix*/interwiki (
   
   UNIQUE KEY iw_prefix (iw_prefix)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-ipb_anon_only.sql b/maintenance/archives/patch-ipb_anon_only.sql
index b3738168aa..d46c04e8f6 100644
--- a/maintenance/archives/patch-ipb_anon_only.sql
+++ b/maintenance/archives/patch-ipb_anon_only.sql
@@ -30,7 +30,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks_newunique (
   INDEX ipb_timestamp (ipb_timestamp),
   INDEX ipb_expiry (ipb_expiry)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 INSERT IGNORE INTO /*$wgDBprefix*/ipblocks_newunique 
         (ipb_id, ipb_address, ipb_user, ipb_by, ipb_reason, ipb_timestamp, ipb_auto, ipb_expiry, ipb_range_start, ipb_range_end, ipb_anon_only, ipb_create_account) 
diff --git a/maintenance/archives/patch-job.sql b/maintenance/archives/patch-job.sql
index d904fbebd0..d931124d5b 100644
--- a/maintenance/archives/patch-job.sql
+++ b/maintenance/archives/patch-job.sql
@@ -17,4 +17,4 @@ CREATE TABLE /*$wgDBprefix*/job (
 
   PRIMARY KEY job_id (job_id),
   KEY (job_cmd, job_namespace, job_title)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-langlinks.sql b/maintenance/archives/patch-langlinks.sql
index 9c3b7e5415..33eb419d1f 100644
--- a/maintenance/archives/patch-langlinks.sql
+++ b/maintenance/archives/patch-langlinks.sql
@@ -10,5 +10,5 @@ CREATE TABLE /*$wgDBprefix*/langlinks (
 
   UNIQUE KEY (ll_from, ll_lang),
   KEY (ll_lang, ll_title)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
diff --git a/maintenance/archives/patch-linkscc.sql b/maintenance/archives/patch-linkscc.sql
index 91d4da56bc..684384f505 100644
--- a/maintenance/archives/patch-linkscc.sql
+++ b/maintenance/archives/patch-linkscc.sql
@@ -9,4 +9,4 @@ CREATE TABLE /*$wgDBprefix*/linkscc (
   lcc_pageid INT UNSIGNED NOT NULL UNIQUE KEY,
   lcc_cacheobj MEDIUMBLOB NOT NULL
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-linktables.sql b/maintenance/archives/patch-linktables.sql
index bb9bd03350..8c521ad933 100644
--- a/maintenance/archives/patch-linktables.sql
+++ b/maintenance/archives/patch-linktables.sql
@@ -16,7 +16,7 @@ CREATE TABLE /*$wgDBprefix*/links (
   UNIQUE KEY l_from(l_from,l_to),
   KEY (l_to)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Track links to pages that don't yet exist.
@@ -35,7 +35,7 @@ CREATE TABLE /*$wgDBprefix*/brokenlinks (
   UNIQUE KEY bl_from(bl_from,bl_to),
   KEY (bl_to)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Track links to images *used inline*
@@ -55,7 +55,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks (
   UNIQUE KEY il_from(il_from,il_to),
   KEY (il_to)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Stores (possibly gzipped) serialized objects with
@@ -67,4 +67,4 @@ CREATE TABLE /*$wgDBprefix*/linkscc (
   lcc_pageid INT UNSIGNED NOT NULL UNIQUE KEY,
   lcc_cacheobj MEDIUMBLOB NOT NULL
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-logging.sql b/maintenance/archives/patch-logging.sql
index 54146fb78a..96847526b4 100644
--- a/maintenance/archives/patch-logging.sql
+++ b/maintenance/archives/patch-logging.sql
@@ -29,7 +29,7 @@ CREATE TABLE /*$wgDBprefix*/logging (
   KEY user_time (log_user, log_timestamp),
   KEY page_time (log_namespace, log_title, log_timestamp)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 -- Change from unsigned to signed so we can store special pages
diff --git a/maintenance/archives/patch-math.sql b/maintenance/archives/patch-math.sql
index aee24a8af7..d217eceab0 100644
--- a/maintenance/archives/patch-math.sql
+++ b/maintenance/archives/patch-math.sql
@@ -25,4 +25,4 @@ CREATE TABLE /*$wgDBprefix*/math (
   
   UNIQUE KEY math_inputhash (math_inputhash)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-objectcache.sql b/maintenance/archives/patch-objectcache.sql
index 18572aa099..a439dd03db 100644
--- a/maintenance/archives/patch-objectcache.sql
+++ b/maintenance/archives/patch-objectcache.sql
@@ -6,4 +6,4 @@ CREATE TABLE /*$wgDBprefix*/objectcache (
   unique key (keyname),
   key (exptime)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-page_restrictions.sql b/maintenance/archives/patch-page_restrictions.sql
index b4ef34be63..c0eafab9e5 100644
--- a/maintenance/archives/patch-page_restrictions.sql
+++ b/maintenance/archives/patch-page_restrictions.sql
@@ -19,4 +19,4 @@ CREATE TABLE /*$wgDBprefix*/page_restrictions (
 	KEY pr_typelevel (pr_type,pr_level),
 	KEY pr_level (pr_level),
 	KEY pr_cascade (pr_cascade)
-) TYPE=InnoDB;
\ No newline at end of file
+) /*$wgDBTableOptions*/;
\ No newline at end of file
diff --git a/maintenance/archives/patch-pagelinks.sql b/maintenance/archives/patch-pagelinks.sql
index 7240cff967..91e279da1a 100644
--- a/maintenance/archives/patch-pagelinks.sql
+++ b/maintenance/archives/patch-pagelinks.sql
@@ -30,7 +30,7 @@ CREATE TABLE /*$wgDBprefix*/pagelinks (
   UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title),
   KEY (pl_namespace,pl_title)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 -- Import existing-page links
diff --git a/maintenance/archives/patch-parsercache.sql b/maintenance/archives/patch-parsercache.sql
index 854e6c57ce..395a81bd68 100644
--- a/maintenance/archives/patch-parsercache.sql
+++ b/maintenance/archives/patch-parsercache.sql
@@ -12,4 +12,4 @@ CREATE TABLE /*$wgDBprefix*/parsercache (
   PRIMARY KEY (pc_pageid, pc_prefhash),
   KEY(pc_title),
   KEY(pc_expire)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-querycache.sql b/maintenance/archives/patch-querycache.sql
index 7df9129e93..d0a592acf7 100644
--- a/maintenance/archives/patch-querycache.sql
+++ b/maintenance/archives/patch-querycache.sql
@@ -13,4 +13,4 @@ CREATE TABLE /*$wgDBprefix*/querycache (
   
   KEY (qc_type,qc_value)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-querycacheinfo.sql b/maintenance/archives/patch-querycacheinfo.sql
index 0e34b3a56b..d90189e265 100644
--- a/maintenance/archives/patch-querycacheinfo.sql
+++ b/maintenance/archives/patch-querycacheinfo.sql
@@ -9,4 +9,4 @@ CREATE TABLE /*$wgDBprefix*/querycache_info (
 
 	UNIQUE KEY ( qci_type )
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-querycachetwo.sql b/maintenance/archives/patch-querycachetwo.sql
index cda5b90d07..4f7a60ac63 100644
--- a/maintenance/archives/patch-querycachetwo.sql
+++ b/maintenance/archives/patch-querycachetwo.sql
@@ -19,4 +19,4 @@ CREATE TABLE /*$wgDBprefix*/querycachetwo (
   KEY qcc_title (qcc_type,qcc_namespace,qcc_title),
   KEY qcc_titletwo (qcc_type,qcc_namespacetwo,qcc_titletwo)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-redirect.sql b/maintenance/archives/patch-redirect.sql
index d377f1b1e2..455a674f53 100644
--- a/maintenance/archives/patch-redirect.sql
+++ b/maintenance/archives/patch-redirect.sql
@@ -15,7 +15,7 @@ CREATE TABLE /*$wgDBprefix*/redirect (
 
   PRIMARY KEY rd_from (rd_from),
   KEY rd_ns_title (rd_namespace,rd_title,rd_from)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 -- Import existing redirects
 -- Using ignore because some of the redirect pages contain more than one link
diff --git a/maintenance/archives/patch-templatelinks.sql b/maintenance/archives/patch-templatelinks.sql
index 49bd9c5ef2..31318ba781 100644
--- a/maintenance/archives/patch-templatelinks.sql
+++ b/maintenance/archives/patch-templatelinks.sql
@@ -15,5 +15,5 @@ CREATE TABLE /*$wgDBprefix*/templatelinks (
   UNIQUE KEY tl_from(tl_from,tl_namespace,tl_title),
   KEY (tl_namespace,tl_title)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
diff --git a/maintenance/archives/patch-transcache.sql b/maintenance/archives/patch-transcache.sql
index a244bff898..0d2204e46f 100644
--- a/maintenance/archives/patch-transcache.sql
+++ b/maintenance/archives/patch-transcache.sql
@@ -3,5 +3,5 @@ CREATE TABLE /*$wgDBprefix*/transcache (
 	tc_contents	TEXT,
 	tc_time		INT NOT NULL,
 	UNIQUE INDEX tc_url_idx(tc_url)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
diff --git a/maintenance/archives/patch-user_groups.sql b/maintenance/archives/patch-user_groups.sql
index 50f9999355..20e005208e 100644
--- a/maintenance/archives/patch-user_groups.sql
+++ b/maintenance/archives/patch-user_groups.sql
@@ -22,4 +22,4 @@ CREATE TABLE /*$wgDBprefix*/user_groups (
   
   PRIMARY KEY (ug_user,ug_group),
   KEY (ug_group)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-user_rights.sql b/maintenance/archives/patch-user_rights.sql
index a32ef45719..4c6846e0b4 100644
--- a/maintenance/archives/patch-user_rights.sql
+++ b/maintenance/archives/patch-user_rights.sql
@@ -14,7 +14,7 @@ CREATE TABLE /*$wgDBprefix*/user_rights (
   
   UNIQUE KEY ur_user (ur_user)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 INSERT INTO /*$wgDBprefix*/user_rights SELECT user_id,user_rights FROM /*$wgDBprefix*/user;
 
diff --git a/maintenance/archives/patch-userlevels.sql b/maintenance/archives/patch-userlevels.sql
index ab3a9a7ba8..17ff3c5db8 100644
--- a/maintenance/archives/patch-userlevels.sql
+++ b/maintenance/archives/patch-userlevels.sql
@@ -11,7 +11,7 @@ CREATE TABLE /*$wgDBprefix*/groups (
   gr_rights tinyblob,
   PRIMARY KEY  (gr_id)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 -- Relation table between user and groups
 CREATE TABLE /*$wgDBprefix*/user_groups (
@@ -19,4 +19,4 @@ CREATE TABLE /*$wgDBprefix*/user_groups (
 	ug_group int(5) unsigned NOT NULL default '0',
 	PRIMARY KEY  (ug_user,ug_group)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/archives/patch-validate.sql b/maintenance/archives/patch-validate.sql
index 3fa7e844ec..9701083c13 100644
--- a/maintenance/archives/patch-validate.sql
+++ b/maintenance/archives/patch-validate.sql
@@ -10,4 +10,4 @@ CREATE TABLE /*$wgDBprefix*/validate (
   `val_comment` varchar(255) NOT NULL default '',
   `val_ip` varchar(20) NOT NULL default '',
   KEY `val_user` (`val_user`,`val_revision`)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
diff --git a/maintenance/mysql5/tables-binary.sql b/maintenance/mysql5/tables-binary.sql
deleted file mode 100644
index 35e4e61a76..0000000000
--- a/maintenance/mysql5/tables-binary.sql
+++ /dev/null
@@ -1,1158 +0,0 @@
--- Experimental table definitions for MySQL 4.1 and 5.0 with
--- content-holding fields switched to explicit binary charset.
---
--- Binary is used instead of UTF-8 or UCS-2 so that all of
--- Unicode may be used as UTF-8 (MySQL still does not allow
--- use of characters outside the BMP in UTF-8 and has no UTF-16
--- support).
---
--- This should provide compatibility with our current MySQL 4.0
--- behavior (safe for full UTF-8, but ugly sorting) on newer
--- versions of MySQL server, without the conversion surprises
--- you get from piggybacking on "Latin-1" fields.
---
--- UTF-8 is used for the searchindex fields, as the fulltext index
--- doesn't seem to like the binary encoding.
---
--- Not fully tested, may have surprises!
---
--- TODO: Test various fields
-
--- ------------------------------------------------------------
-
--- SQL to create the initial tables for the MediaWiki database.
--- This is read and executed by the install script; you should
--- not have to run it by itself unless doing a manual install.
-
---
--- General notes:
---
--- If possible, create tables as InnoDB to benefit from the
--- superior resiliency against crashes and ability to read
--- during writes (and write during reads!)
---
--- Only the 'searchindex' table requires MyISAM due to the
--- requirement for fulltext index support, which is missing
--- from InnoDB.
---
---
--- The MySQL table backend for MediaWiki currently uses
--- 14-character CHAR or VARCHAR fields to store timestamps.
--- The format is YYYYMMDDHHMMSS, which is derived from the
--- text format of MySQL's TIMESTAMP fields.
---
--- Historically TIMESTAMP fields were used, but abandoned
--- in early 2002 after a lot of trouble with the fields
--- auto-updating.
---
--- The Postgres backend uses DATETIME fields for timestamps,
--- and we will migrate the MySQL definitions at some point as
--- well.
---
---
--- The /*$wgDBprefix*/ comments in this and other files are
--- replaced with the defined table prefix by the installer
--- and updater scripts. If you are installing or running
--- updates manually, you will need to manually insert the
--- table prefix if any when running these scripts.
---
-
-
---
--- The user table contains basic account information,
--- authentication keys, etc.
---
--- Some multi-wiki sites may share a single central user table
--- between separate wikis using the $wgSharedDB setting.
---
--- Note that when a external authentication plugin is used,
--- user table entries still need to be created to store
--- preferences and to key tracking information in the other
--- tables.
---
-CREATE TABLE /*$wgDBprefix*/user (
-  user_id int(5) unsigned NOT NULL auto_increment,
-  
-  -- Usernames must be unique, must not be in the form of
-  -- an IP address. _Shouldn't_ allow slashes or case
-  -- conflicts. Spaces are allowed, and are _not_ converted
-  -- to underscores like titles. See the User::newFromName() for
-  -- the specific tests that usernames have to pass.
-  user_name varchar(255) binary NOT NULL default '',
-  
-  -- Optional 'real name' to be displayed in credit listings
-  user_real_name varchar(255) binary NOT NULL default '',
-  
-  -- Password hashes, normally hashed like so:
-  -- MD5(CONCAT(user_id,'-',MD5(plaintext_password))), see
-  -- wfEncryptPassword() in GlobalFunctions.php
-  user_password tinyblob NOT NULL,
-  
-  -- When using 'mail me a new password', a random
-  -- password is generated and the hash stored here.
-  -- The previous password is left in place until
-  -- someone actually logs in with the new password,
-  -- at which point the hash is moved to user_password
-  -- and the old password is invalidated.
-  user_newpassword tinyblob NOT NULL,
-
-  -- Timestamp of the last time when a new password was
-  -- sent, for throttling purposes
-  user_newpass_time char(14) binary,
-
-  -- Note: email should be restricted, not public info.
-  -- Same with passwords.
-  user_email tinytext NOT NULL,
-  
-  -- Newline-separated list of name=value defining the user
-  -- preferences
-  user_options blob NOT NULL,
-  
-  -- This is a timestamp which is updated when a user
-  -- logs in, logs out, changes preferences, or performs
-  -- some other action requiring HTML cache invalidation
-  -- to ensure that the UI is updated.
-  user_touched char(14) binary NOT NULL default '',
-  
-  -- A pseudorandomly generated value that is stored in
-  -- a cookie when the "remember password" feature is
-  -- used (previously, a hash of the password was used, but
-  -- this was vulnerable to cookie-stealing attacks)
-  user_token char(32) binary NOT NULL default '',
-  
-  -- Initially NULL; when a user's e-mail address has been
-  -- validated by returning with a mailed token, this is
-  -- set to the current timestamp.
-  user_email_authenticated char(14) binary,
-  
-  -- Randomly generated token created when the e-mail address
-  -- is set and a confirmation test mail sent.
-  user_email_token char(32) binary,
-  
-  -- Expiration date for the user_email_token
-  user_email_token_expires char(14) binary,
-
-  -- Timestamp of account registration.
-  -- Accounts predating this schema addition may contain NULL.
-  user_registration char(14) binary,
-  
-  -- Count of edits and edit-like actions.
-  --
-  -- *NOT* intended to be an accurate copy of COUNT(*) WHERE rev_user=user_id
-  -- May contain NULL for old accounts if batch-update scripts haven't been
-  -- run, as well as listing deleted edits and other myriad ways it could be
-  -- out of sync.
-  --
-  -- Meant primarily for heuristic checks to give an impression of whether
-  -- the account has been used much.
-  --
-  user_editcount int,
-
-  PRIMARY KEY user_id (user_id),
-  UNIQUE INDEX user_name (user_name),
-  INDEX (user_email_token)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- User permissions have been broken out to a separate table;
--- this allows sites with a shared user table to have different
--- permissions assigned to a user in each project.
---
--- This table replaces the old user_rights field which used a
--- comma-separated blob.
---
-CREATE TABLE /*$wgDBprefix*/user_groups (
-  -- Key to user_id
-  ug_user int(5) unsigned NOT NULL default '0',
-  
-  -- Group names are short symbolic string keys.
-  -- The set of group names is open-ended, though in practice
-  -- only some predefined ones are likely to be used.
-  --
-  -- At runtime $wgGroupPermissions will associate group keys
-  -- with particular permissions. A user will have the combined
-  -- permissions of any group they're explicitly in, plus
-  -- the implicit '*' and 'user' groups.
-  ug_group char(16) NOT NULL default '',
-  
-  PRIMARY KEY (ug_user,ug_group),
-  KEY (ug_group)
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
--- Stores notifications of user talk page changes, for the display
--- of the "you have new messages" box
-CREATE TABLE /*$wgDBprefix*/user_newtalk (
-  -- Key to user.user_id
-  user_id int(5) NOT NULL default '0',
-  -- If the user is an anonymous user hir IP address is stored here
-  -- since the user_id of 0 is ambiguous
-  user_ip varchar(40) NOT NULL default '',
-  INDEX user_id (user_id),
-  INDEX user_ip (user_ip)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-
---
--- Core of the wiki: each page has an entry here which identifies
--- it by title and contains some essential metadata.
---
-CREATE TABLE /*$wgDBprefix*/page (
-  -- Unique identifier number. The page_id will be preserved across
-  -- edits and rename operations, but not deletions and recreations.
-  page_id int(8) unsigned NOT NULL auto_increment,
-  
-  -- A page name is broken into a namespace and a title.
-  -- The namespace keys are UI-language-independent constants,
-  -- defined in includes/Defines.php
-  page_namespace int NOT NULL,
-  
-  -- The rest of the title, as text.
-  -- Spaces are transformed into underscores in title storage.
-  page_title varchar(255) binary NOT NULL,
-  
-  -- Comma-separated set of permission keys indicating who
-  -- can move or edit the page.
-  page_restrictions tinyblob NOT NULL,
-  
-  -- Number of times this page has been viewed.
-  page_counter bigint(20) unsigned NOT NULL default '0',
-  
-  -- 1 indicates the article is a redirect.
-  page_is_redirect tinyint(1) unsigned NOT NULL default '0',
-  
-  -- 1 indicates this is a new entry, with only one edit.
-  -- Not all pages with one edit are new pages.
-  page_is_new tinyint(1) unsigned NOT NULL default '0',
-  
-  -- Random value between 0 and 1, used for Special:Randompage
-  page_random real unsigned NOT NULL,
-  
-  -- This timestamp is updated whenever the page changes in
-  -- a way requiring it to be re-rendered, invalidating caches.
-  -- Aside from editing this includes permission changes,
-  -- creation or deletion of linked pages, and alteration
-  -- of contained templates.
-  page_touched char(14) binary NOT NULL default '',
-
-  -- Handy key to revision.rev_id of the current revision.
-  -- This may be 0 during page creation, but that shouldn't
-  -- happen outside of a transaction... hopefully.
-  page_latest int(8) unsigned NOT NULL,
-  
-  -- Uncompressed length in bytes of the page's current source text.
-  page_len int(8) unsigned NOT NULL,
-
-  PRIMARY KEY page_id (page_id),
-  UNIQUE INDEX name_title (page_namespace,page_title),
-  
-  -- Special-purpose indexes
-  INDEX (page_random),
-  INDEX (page_len)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Every edit of a page creates also a revision row.
--- This stores metadata about the revision, and a reference
--- to the text storage backend.
---
-CREATE TABLE /*$wgDBprefix*/revision (
-  rev_id int(8) unsigned NOT NULL auto_increment,
-  
-  -- Key to page_id. This should _never_ be invalid.
-  rev_page int(8) unsigned NOT NULL,
-  
-  -- Key to text.old_id, where the actual bulk text is stored.
-  -- It's possible for multiple revisions to use the same text,
-  -- for instance revisions where only metadata is altered
-  -- or a rollback to a previous version.
-  rev_text_id int(8) unsigned NOT NULL,
-  
-  -- Text comment summarizing the change.
-  -- This text is shown in the history and other changes lists,
-  -- rendered in a subset of wiki markup by Linker::formatComment()
-  rev_comment tinyblob NOT NULL,
-  
-  -- Key to user.user_id of the user who made this edit.
-  -- Stores 0 for anonymous edits and for some mass imports.
-  rev_user int(5) unsigned NOT NULL default '0',
-  
-  -- Text username or IP address of the editor.
-  rev_user_text varchar(255) binary NOT NULL default '',
-  
-  -- Timestamp
-  rev_timestamp char(14) binary NOT NULL default '',
-  
-  -- Records whether the user marked the 'minor edit' checkbox.
-  -- Many automated edits are marked as minor.
-  rev_minor_edit tinyint(1) unsigned NOT NULL default '0',
-  
-  -- Not yet used; reserved for future changes to the deletion system.
-  rev_deleted tinyint(1) unsigned NOT NULL default '0',
-
-  -- Length of this revision in bytes
-  rev_len int(8) unsigned,
-
-  -- Key to revision.rev_id
-  -- This field is used to add support for a tree structure (The Adjacency List Model)
-  rev_parent_id int(8) unsigned default NULL,
-
-  PRIMARY KEY rev_page_id (rev_page, rev_id),
-  UNIQUE INDEX rev_id (rev_id),
-  INDEX rev_timestamp (rev_timestamp),
-  INDEX page_timestamp (rev_page,rev_timestamp),
-  INDEX user_timestamp (rev_user,rev_timestamp),
-  INDEX usertext_timestamp (rev_user_text,rev_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-
---
--- Holds text of individual page revisions.
---
--- Field names are a holdover from the 'old' revisions table in
--- MediaWiki 1.4 and earlier: an upgrade will transform that
--- table into the 'text' table to minimize unnecessary churning
--- and downtime. If upgrading, the other fields will be left unused.
---
-CREATE TABLE /*$wgDBprefix*/text (
-  -- Unique text storage key number.
-  -- Note that the 'oldid' parameter used in URLs does *not*
-  -- refer to this number anymore, but to rev_id.
-  --
-  -- revision.rev_text_id is a key to this column
-  old_id int(8) unsigned NOT NULL auto_increment,
-  
-  -- Depending on the contents of the old_flags field, the text
-  -- may be convenient plain text, or it may be funkily encoded.
-  old_text mediumblob NOT NULL,
-  
-  -- Comma-separated list of flags:
-  -- gzip: text is compressed with PHP's gzdeflate() function.
-  -- utf8: text was stored as UTF-8.
-  --       If $wgLegacyEncoding option is on, rows *without* this flag
-  --       will be converted to UTF-8 transparently at load time.
-  -- object: text field contained a serialized PHP object.
-  --         The object either contains multiple versions compressed
-  --         together to achieve a better compression ratio, or it refers
-  --         to another row where the text can be found.
-  old_flags tinyblob NOT NULL,
-  
-  PRIMARY KEY old_id (old_id)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Holding area for deleted articles, which may be viewed
--- or restored by admins through the Special:Undelete interface.
--- The fields generally correspond to the page, revision, and text
--- fields, with several caveats.
---
-CREATE TABLE /*$wgDBprefix*/archive (
-  ar_namespace int NOT NULL default '0',
-  ar_title varchar(255) binary NOT NULL default '',
-  
-  -- Newly deleted pages will not store text in this table,
-  -- but will reference the separately existing text rows.
-  -- This field is retained for backwards compatibility,
-  -- so old archived pages will remain accessible after
-  -- upgrading from 1.4 to 1.5.
-  -- Text may be gzipped or otherwise funky.
-  ar_text mediumblob NOT NULL,
-  
-  -- Basic revision stuff...
-  ar_comment tinyblob NOT NULL,
-  ar_user int(5) unsigned NOT NULL default '0',
-  ar_user_text varchar(255) binary NOT NULL,
-  ar_timestamp char(14) binary NOT NULL default '',
-  ar_minor_edit tinyint(1) NOT NULL default '0',
-  
-  -- See ar_text note.
-  ar_flags tinyblob NOT NULL,
-  
-  -- When revisions are deleted, their unique rev_id is stored
-  -- here so it can be retained after undeletion. This is necessary
-  -- to retain permalinks to given revisions after accidental delete
-  -- cycles or messy operations like history merges.
-  -- 
-  -- Old entries from 1.4 will be NULL here, and a new rev_id will
-  -- be created on undeletion for those revisions.
-  ar_rev_id int(8) unsigned,
-  
-  -- For newly deleted revisions, this is the text.old_id key to the
-  -- actual stored text. To avoid breaking the block-compression scheme
-  -- and otherwise making storage changes harder, the actual text is
-  -- *not* deleted from the text table, merely hidden by removal of the
-  -- page and revision entries.
-  --
-  -- Old entries deleted under 1.2-1.4 will have NULL here, and their
-  -- ar_text and ar_flags fields will be used to create a new text
-  -- row upon undeletion.
-  ar_text_id int(8) unsigned,
-  
-  -- rev_deleted for archives
-  ar_deleted tinyint(1) unsigned NOT NULL default '0',
-  -- Length of this revision in bytes
-  ar_len int(8) unsigned,
-    
-  KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-
---
--- Track page-to-page hyperlinks within the wiki.
---
-CREATE TABLE /*$wgDBprefix*/pagelinks (
-  -- Key to the page_id of the page containing the link.
-  pl_from int(8) unsigned NOT NULL default '0',
-  
-  -- Key to page_namespace/page_title of the target page.
-  -- The target page may or may not exist, and due to renames
-  -- and deletions may refer to different page records as time
-  -- goes by.
-  pl_namespace int NOT NULL default '0',
-  pl_title varchar(255) binary NOT NULL default '',
-  
-  UNIQUE KEY pl_from (pl_from,pl_namespace,pl_title),
-  KEY (pl_namespace,pl_title,pl_from)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-
---
--- Track template inclusions.
---
-CREATE TABLE /*$wgDBprefix*/templatelinks (
-  -- Key to the page_id of the page containing the link.
-  tl_from int(8) unsigned NOT NULL default '0',
-  
-  -- Key to page_namespace/page_title of the target page.
-  -- The target page may or may not exist, and due to renames
-  -- and deletions may refer to different page records as time
-  -- goes by.
-  tl_namespace int NOT NULL default '0',
-  tl_title varchar(255) binary NOT NULL default '',
-  
-  UNIQUE KEY tl_from (tl_from,tl_namespace,tl_title),
-  KEY (tl_namespace,tl_title,tl_from)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Track links to images *used inline*
--- We don't distinguish live from broken links here, so
--- they do not need to be changed on upload/removal.
---
-CREATE TABLE /*$wgDBprefix*/imagelinks (
-  -- Key to page_id of the page containing the image / media link.
-  il_from int(8) unsigned NOT NULL default '0',
-  
-  -- Filename of target image.
-  -- This is also the page_title of the file's description page;
-  -- all such pages are in namespace 6 (NS_IMAGE).
-  il_to varchar(255) binary NOT NULL default '',
-  
-  UNIQUE KEY il_from (il_from,il_to),
-  KEY (il_to,il_from)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Track category inclusions *used inline*
--- This tracks a single level of category membership
--- (folksonomic tagging, really).
---
-CREATE TABLE /*$wgDBprefix*/categorylinks (
-  -- Key to page_id of the page defined as a category member.
-  cl_from int(8) unsigned NOT NULL default '0',
-  
-  -- Name of the category.
-  -- This is also the page_title of the category's description page;
-  -- all such pages are in namespace 14 (NS_CATEGORY).
-  cl_to varchar(255) binary NOT NULL default '',
-  
-  -- The title of the linking page, or an optional override
-  -- to determine sort order. Sorting is by binary order, which
-  -- isn't always ideal, but collations seem to be an exciting
-  -- and dangerous new world in MySQL... The sortkey is updated
-  -- if no override exists and cl_from is renamed.
-  --
-  -- For MySQL 4.1+ with charset set to utf8, the sort key *index*
-  -- needs cut to be smaller than 1024 bytes (at 3 bytes per char).
-  -- To sort properly on the shorter key, this field needs to be
-  -- the same shortness.
-  cl_sortkey varchar(86) binary NOT NULL default '',
-  
-  -- This isn't really used at present. Provided for an optional
-  -- sorting method by approximate addition time.
-  cl_timestamp timestamp NOT NULL,
-  
-  UNIQUE KEY cl_from (cl_from,cl_to),
-  
-  -- We always sort within a given category...
-  KEY cl_sortkey (cl_to,cl_sortkey),
-  
-  -- Not really used?
-  KEY cl_timestamp (cl_to,cl_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Track links to external URLs
---
-CREATE TABLE /*$wgDBprefix*/externallinks (
-  -- page_id of the referring page
-  el_from int(8) unsigned NOT NULL default '0',
-
-  -- The URL
-  el_to blob NOT NULL,
-
-  -- In the case of HTTP URLs, this is the URL with any username or password
-  -- removed, and with the labels in the hostname reversed and converted to 
-  -- lower case. An extra dot is added to allow for matching of either
-  -- example.com or *.example.com in a single scan.
-  -- Example: 
-  --      http://user:password@sub.example.com/page.html
-  --   becomes
-  --      http://com.example.sub./page.html
-  -- which allows for fast searching for all pages under example.com with the
-  -- clause: 
-  --      WHERE el_index LIKE 'http://com.example.%'
-  el_index blob NOT NULL,
-  
-  KEY (el_from, el_to(40)),
-  KEY (el_to(60), el_from),
-  KEY (el_index(60))
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
--- 
--- Track interlanguage links
---
-CREATE TABLE /*$wgDBprefix*/langlinks (
-  -- page_id of the referring page
-  ll_from int(8) unsigned NOT NULL default '0',
-  
-  -- Language code of the target
-  ll_lang varchar(10) binary NOT NULL default '',
-
-  -- Title of the target, including namespace
-  ll_title varchar(255) binary NOT NULL default '',
-
-  UNIQUE KEY (ll_from, ll_lang),
-  KEY (ll_lang, ll_title)
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Contains a single row with some aggregate info
--- on the state of the site.
---
-CREATE TABLE /*$wgDBprefix*/site_stats (
-  -- The single row should contain 1 here.
-  ss_row_id int(8) unsigned NOT NULL,
-  
-  -- Total number of page views, if hit counters are enabled.
-  ss_total_views bigint(20) unsigned default '0',
-  
-  -- Total number of edits performed.
-  ss_total_edits bigint(20) unsigned default '0',
-  
-  -- An approximate count of pages matching the following criteria:
-  -- * in namespace 0
-  -- * not a redirect
-  -- * contains the text '[['
-  -- See Article::isCountable() in includes/Article.php
-  ss_good_articles bigint(20) unsigned default '0',
-  
-  -- Total pages, theoretically equal to SELECT COUNT(*) FROM page; except faster
-  ss_total_pages bigint(20) default '-1',
-
-  -- Number of users, theoretically equal to SELECT COUNT(*) FROM user;
-  ss_users bigint(20) default '-1',
-
-  -- Deprecated, no longer updated as of 1.5
-  ss_admins int(10) default '-1',
-
-  -- Number of images, equivalent to SELECT COUNT(*) FROM image
-  ss_images int(10) default '0',
-
-  UNIQUE KEY ss_row_id (ss_row_id)
-
-) ENGINE=InnoDB;
-
---
--- Stores an ID for every time any article is visited;
--- depending on $wgHitcounterUpdateFreq, it is
--- periodically cleared and the page_counter column
--- in the page table updated for the all articles
--- that have been visited.)
---
-CREATE TABLE /*$wgDBprefix*/hitcounter (
-  hc_id int unsigned NOT NULL
-) ENGINE=HEAP MAX_ROWS=25000;
-
-
---
--- The internet is full of jerks, alas. Sometimes it's handy
--- to block a vandal or troll account.
---
-CREATE TABLE /*$wgDBprefix*/ipblocks (
-  -- Primary key, introduced for privacy.
-  ipb_id int(8) NOT NULL auto_increment,
-  
-  -- Blocked IP address in dotted-quad form or user name.
-  ipb_address tinyblob NOT NULL,
-  
-  -- Blocked user ID or 0 for IP blocks.
-  ipb_user int(8) unsigned NOT NULL default '0',
-  
-  -- User ID who made the block.
-  ipb_by int(8) unsigned NOT NULL default '0',
-  
-  -- Text comment made by blocker.
-  ipb_reason tinyblob NOT NULL,
-  
-  -- Creation (or refresh) date in standard YMDHMS form.
-  -- IP blocks expire automatically.
-  ipb_timestamp char(14) binary NOT NULL default '',
-  
-  -- Indicates that the IP address was banned because a banned
-  -- user accessed a page through it. If this is 1, ipb_address
-  -- will be hidden, and the block identified by block ID number.
-  ipb_auto bool NOT NULL default 0,
-
-  -- If set to 1, block applies only to logged-out users
-  ipb_anon_only bool NOT NULL default 0,
-
-  -- Block prevents account creation from matching IP addresses
-  ipb_create_account bool NOT NULL default 1,
-
-  -- Block triggers autoblocks
-  ipb_enable_autoblock bool NOT NULL default '1',
-  
-  -- Time at which the block will expire.
-  ipb_expiry char(14) binary NOT NULL default '',
-  
-  -- Start and end of an address range, in hexadecimal
-  -- Size chosen to allow IPv6
-  ipb_range_start tinyblob NOT NULL,
-  ipb_range_end tinyblob NOT NULL,
-  -- Flag for entries hidden from users and Sysops
-  ipb_deleted bool NOT NULL default 0,
-
-  PRIMARY KEY ipb_id (ipb_id),
-
-  -- Unique index to support "user already blocked" messages
-  -- Any new options which prevent collisions should be included
-  UNIQUE INDEX ipb_address (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only),
-
-  INDEX ipb_user (ipb_user),
-  INDEX ipb_range (ipb_range_start(8), ipb_range_end(8)),
-  INDEX ipb_timestamp (ipb_timestamp),
-  INDEX ipb_expiry (ipb_expiry)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-
---
--- Uploaded images and other files.
---
-CREATE TABLE /*$wgDBprefix*/image (
-  -- Filename.
-  -- This is also the title of the associated description page,
-  -- which will be in namespace 6 (NS_IMAGE).
-  img_name varchar(255) binary NOT NULL default '',
-  
-  -- File size in bytes.
-  img_size int(8) unsigned NOT NULL default '0',
-  
-  -- For images, size in pixels.
-  img_width int(5) NOT NULL default '0',
-  img_height int(5) NOT NULL default '0',
-  
-  -- Extracted EXIF metadata stored as a serialized PHP array.
-  img_metadata mediumblob NOT NULL,
-  
-  -- For images, bits per pixel if known.
-  img_bits int(3) NOT NULL default '0',
-  
-  -- Media type as defined by the MEDIATYPE_xxx constants
-  img_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
-  
-  -- major part of a MIME media type as defined by IANA
-  -- see http://www.iana.org/assignments/media-types/
-  img_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") NOT NULL default "unknown",
-  
-  -- minor part of a MIME media type as defined by IANA
-  -- the minor parts are not required to adher to any standard
-  -- but should be consistent throughout the database
-  -- see http://www.iana.org/assignments/media-types/
-  img_minor_mime varchar(32) NOT NULL default "unknown",
-  
-  -- Description field as entered by the uploader.
-  -- This is displayed in image upload history and logs.
-  img_description tinyblob NOT NULL,
-  
-  -- user_id and user_name of uploader.
-  img_user int(5) unsigned NOT NULL default '0',
-  img_user_text varchar(255) binary NOT NULL,
-  
-  -- Time of the upload.
-  img_timestamp char(14) binary NOT NULL default '',
-  
-  PRIMARY KEY img_name (img_name),
-  
-  -- Used by Special:Imagelist for sort-by-size
-  INDEX img_size (img_size),
-
-  -- Used by Special:Newimages and Special:Imagelist
-  INDEX img_timestamp (img_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Previous revisions of uploaded files.
--- Awkwardly, image rows have to be moved into
--- this table at re-upload time.
---
-CREATE TABLE /*$wgDBprefix*/oldimage (
-  -- Base filename: key to image.img_name
-  oi_name varchar(255) binary NOT NULL default '',
-  
-  -- Filename of the archived file.
-  -- This is generally a timestamp and '!' prepended to the base name.
-  oi_archive_name varchar(255) binary NOT NULL default '',
-  
-  -- Other fields as in image...
-  oi_size int(8) unsigned NOT NULL default 0,
-  oi_width int(5) NOT NULL default 0,
-  oi_height int(5) NOT NULL default 0,
-  oi_bits int(3) NOT NULL default 0,
-  oi_description tinyblob NOT NULL,
-  oi_user int(5) unsigned NOT NULL default '0',
-  oi_user_text varchar(255) binary NOT NULL,
-  oi_timestamp char(14) binary NOT NULL default '',
-
-  INDEX oi_name (oi_name(10))
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Record of deleted file data
---
-CREATE TABLE /*$wgDBprefix*/filearchive (
-  -- Unique row id
-  fa_id int NOT NULL auto_increment,
-  
-  -- Original base filename; key to image.img_name, page.page_title, etc
-  fa_name varchar(255) binary NOT NULL default '',
-  
-  -- Filename of archived file, if an old revision
-  fa_archive_name varchar(255) binary default '',
-  
-  -- Which storage bin (directory tree or object store) the file data
-  -- is stored in. Should be 'deleted' for files that have been deleted;
-  -- any other bin is not yet in use.
-  fa_storage_group varchar(16),
-  
-  -- SHA-1 of the file contents plus extension, used as a key for storage.
-  -- eg 8f8a562add37052a1848ff7771a2c515db94baa9.jpg
-  --
-  -- If NULL, the file was missing at deletion time or has been purged
-  -- from the archival storage.
-  fa_storage_key varchar(64) binary default '',
-  
-  -- Deletion information, if this file is deleted.
-  fa_deleted_user int,
-  fa_deleted_timestamp char(14) binary default '',
-  fa_deleted_reason text,
-  
-  -- Duped fields from image
-  fa_size int(8) unsigned default '0',
-  fa_width int(5) default '0',
-  fa_height int(5) default '0',
-  fa_metadata mediumblob,
-  fa_bits int(3) default '0',
-  fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
-  fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") default "unknown",
-  fa_minor_mime varchar(32) default "unknown",
-  fa_description tinyblob,
-  fa_user int(5) unsigned default '0',
-  fa_user_text varchar(255) binary,
-  fa_timestamp char(14) binary default '',
-  
-  -- Visibility of deleted revisions, bitfield
-  fa_deleted tinyint(1) unsigned NOT NULL default '0',
-  
-  PRIMARY KEY (fa_id),
-  INDEX (fa_name, fa_timestamp),             -- pick out by image name
-  INDEX (fa_storage_group, fa_storage_key),  -- pick out dupe files
-  INDEX (fa_deleted_timestamp),              -- sort by deletion time
-  INDEX (fa_deleted_user)                    -- sort by deleter
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Primarily a summary table for Special:Recentchanges,
--- this table contains some additional info on edits from
--- the last few days, see Article::editUpdates()
---
-CREATE TABLE /*$wgDBprefix*/recentchanges (
-  rc_id int(8) NOT NULL auto_increment,
-  rc_timestamp varchar(14) binary NOT NULL default '',
-  rc_cur_time varchar(14) binary NOT NULL default '',
-  
-  -- As in revision
-  rc_user int(10) unsigned NOT NULL default '0',
-  rc_user_text varchar(255) binary NOT NULL,
-  
-  -- When pages are renamed, their RC entries do _not_ change.
-  rc_namespace int NOT NULL default '0',
-  rc_title varchar(255) binary NOT NULL default '',
-  
-  -- as in revision...
-  rc_comment varchar(255) binary NOT NULL default '',
-  rc_minor tinyint(3) unsigned NOT NULL default '0',
-  
-  -- Edits by user accounts with the 'bot' rights key are
-  -- marked with a 1 here, and will be hidden from the
-  -- default view.
-  rc_bot tinyint(3) unsigned NOT NULL default '0',
-  
-  rc_new tinyint(3) unsigned NOT NULL default '0',
-  
-  -- Key to page_id (was cur_id prior to 1.5).
-  -- This will keep links working after moves while
-  -- retaining the at-the-time name in the changes list.
-  rc_cur_id int(10) unsigned NOT NULL default '0',
-  
-  -- rev_id of the given revision
-  rc_this_oldid int(10) unsigned NOT NULL default '0',
-  
-  -- rev_id of the prior revision, for generating diff links.
-  rc_last_oldid int(10) unsigned NOT NULL default '0',
-  
-  -- These may no longer be used, with the new move log.
-  rc_type tinyint(3) unsigned NOT NULL default '0',
-  rc_moved_to_ns tinyint(3) unsigned NOT NULL default '0',
-  rc_moved_to_title varchar(255) binary NOT NULL default '',
-  
-  -- If the Recent Changes Patrol option is enabled,
-  -- users may mark edits as having been reviewed to
-  -- remove a warning flag on the RC list.
-  -- A value of 1 indicates the page has been reviewed.
-  rc_patrolled tinyint(3) unsigned NOT NULL default '0',
-  
-  -- Recorded IP address the edit was made from, if the
-  -- $wgPutIPinRC option is enabled.
-  rc_ip char(15) NOT NULL default '',
-  
-  -- Text length in characters before
-  -- and after the edit
-  rc_old_len int(10),
-  rc_new_len int(10),
-
-  -- Visibility of deleted revisions, bitfield
-  rc_deleted tinyint(1) unsigned NOT NULL default '0',
-  
-  -- Value corresonding to log_id, specific log entries
-  rc_logid int(10) unsigned NOT NULL default '0',
-  -- Store log type info here, or null
-  rc_log_type varchar(255) binary NULL default NULL,
-  -- Store log action or null
-  rc_log_action varchar(255) binary NULL default NULL,
-  -- Log params
-  rc_params blob NOT NULL default '',
-  
-  PRIMARY KEY rc_id (rc_id),
-  INDEX rc_timestamp (rc_timestamp),
-  INDEX rc_namespace_title (rc_namespace, rc_title),
-  INDEX rc_cur_id (rc_cur_id),
-  INDEX new_name_timestamp (rc_new,rc_namespace,rc_timestamp),
-  INDEX rc_ip (rc_ip),
-  INDEX rc_ns_usertext (rc_namespace, rc_user_text),
-  INDEX rc_user_text (rc_user_text, rc_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-CREATE TABLE /*$wgDBprefix*/watchlist (
-  -- Key to user.user_id
-  wl_user int(5) unsigned NOT NULL,
-  
-  -- Key to page_namespace/page_title
-  -- Note that users may watch pages which do not exist yet,
-  -- or existed in the past but have been deleted.
-  wl_namespace int NOT NULL default '0',
-  wl_title varchar(255) binary NOT NULL default '',
-  
-  -- Timestamp when user was last sent a notification e-mail;
-  -- cleared when the user visits the page.
-  wl_notificationtimestamp varchar(14) binary,
-  
-  UNIQUE KEY (wl_user, wl_namespace, wl_title),
-  KEY namespace_title (wl_namespace, wl_title)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-
---
--- Used by the math module to keep track
--- of previously-rendered items.
---
-CREATE TABLE /*$wgDBprefix*/math (
-  -- Binary MD5 hash of the latex fragment, used as an identifier key.
-  math_inputhash varbinary(16) NOT NULL,
-  
-  -- Not sure what this is, exactly...
-  math_outputhash varbinary(16) NOT NULL,
-  
-  -- texvc reports how well it thinks the HTML conversion worked;
-  -- if it's a low level the PNG rendering may be preferred.
-  math_html_conservativeness tinyint(1) NOT NULL,
-  
-  -- HTML output from texvc, if any
-  math_html text,
-  
-  -- MathML output from texvc, if any
-  math_mathml text,
-  
-  UNIQUE KEY math_inputhash (math_inputhash)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- When using the default MySQL search backend, page titles
--- and text are munged to strip markup, do Unicode case folding,
--- and prepare the result for MySQL's fulltext index.
---
--- This table must be MyISAM; InnoDB does not support the needed
--- fulltext index.
---
-CREATE TABLE /*$wgDBprefix*/searchindex (
-  -- Key to page_id
-  si_page int(8) unsigned NOT NULL,
-  
-  -- Munged version of title
-  si_title varchar(255) NOT NULL default '',
-  
-  -- Munged version of body text
-  si_text mediumtext NOT NULL,
-  
-  UNIQUE KEY (si_page),
-  FULLTEXT si_title (si_title),
-  FULLTEXT si_text (si_text)
-
-) ENGINE=MyISAM, DEFAULT CHARSET=utf8;
-
---
--- Recognized interwiki link prefixes
---
-CREATE TABLE /*$wgDBprefix*/interwiki (
-  -- The interwiki prefix, (e.g. "Meatball", or the language prefix "de")
-  iw_prefix char(32) NOT NULL,
-  
-  -- The URL of the wiki, with "$1" as a placeholder for an article name.
-  -- Any spaces in the name will be transformed to underscores before
-  -- insertion.
-  iw_url char(127) NOT NULL,
-  
-  -- A boolean value indicating whether the wiki is in this project
-  -- (used, for example, to detect redirect loops)
-  iw_local bool NOT NULL,
-  
-  -- Boolean value indicating whether interwiki transclusions are allowed.
-  iw_trans tinyint(1) NOT NULL default 0,
-  
-  UNIQUE KEY iw_prefix (iw_prefix)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Used for caching expensive grouped queries
---
-CREATE TABLE /*$wgDBprefix*/querycache (
-  -- A key name, generally the base name of of the special page.
-  qc_type char(32) NOT NULL,
-  
-  -- Some sort of stored value. Sizes, counts...
-  qc_value int(5) unsigned NOT NULL default '0',
-  
-  -- Target namespace+title
-  qc_namespace int NOT NULL default '0',
-  qc_title char(255) binary NOT NULL default '',
-  
-  KEY (qc_type,qc_value)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- For a few generic cache operations if not using Memcached
---
-CREATE TABLE /*$wgDBprefix*/objectcache (
-  keyname char(255) binary NOT NULL default '',
-  value mediumblob,
-  exptime datetime,
-  UNIQUE KEY (keyname),
-  KEY (exptime)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---
--- Cache of interwiki transclusion
---
-CREATE TABLE /*$wgDBprefix*/transcache (
-  tc_url varchar(255) NOT NULL,
-  tc_contents text,
-  tc_time int NOT NULL,
-  UNIQUE INDEX tc_url_idx (tc_url)
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-CREATE TABLE /*$wgDBprefix*/logging (
-  -- Symbolic keys for the general log type and the action type
-  -- within the log. The output format will be controlled by the
-  -- action field, but only the type controls categorization.
-  log_type char(10) NOT NULL default '',
-  log_action char(10) NOT NULL default '',
-  
-  -- Timestamp. Duh.
-  log_timestamp char(14) NOT NULL default '19700101000000',
-  
-  -- The user who performed this action; key to user_id
-  log_user int unsigned NOT NULL default 0,
-  
-  -- Key to the page affected. Where a user is the target,
-  -- this will point to the user page.
-  log_namespace int NOT NULL default 0,
-  log_title varchar(255) binary NOT NULL default '',
-  
-  -- Freeform text. Interpreted as edit history comments.
-  log_comment varchar(255) NOT NULL default '',
-  
-  -- LF separated list of miscellaneous parameters
-  log_params blob NOT NULL,
-  
-  -- Log ID, for referring to this specific log entry, probably for deletion and such.
-  log_id int unsigned NOT NULL auto_increment,
-
-  -- rev_deleted for logs
-  log_deleted tinyint(1) unsigned NOT NULL default '0',
-
-  KEY type_time (log_type, log_timestamp),
-  KEY user_time (log_user, log_timestamp),
-  KEY page_time (log_namespace, log_title, log_timestamp),
-  KEY times (log_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-CREATE TABLE /*$wgDBprefix*/trackbacks (
-  tb_id int auto_increment,
-  tb_page int REFERENCES page(page_id) ON DELETE CASCADE,
-  tb_title varchar(255) NOT NULL,
-  tb_url varchar(255) NOT NULL,
-  tb_ex text,
-  tb_name varchar(255),
-
-  PRIMARY KEY (tb_id),
-  INDEX (tb_page)
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-
--- Jobs performed by parallel apache threads or a command-line daemon
-CREATE TABLE /*$wgDBprefix*/job (
-  job_id int(9) unsigned NOT NULL auto_increment,
-  
-  -- Command name, currently only refreshLinks is defined
-  job_cmd varchar(255) NOT NULL default '',
-
-  -- Namespace and title to act on
-  -- Should be 0 and '' if the command does not operate on a title
-  job_namespace int NOT NULL,
-  job_title varchar(255) binary NOT NULL,
-
-  -- Any other parameters to the command
-  -- Presently unused, format undefined
-  job_params blob NOT NULL,
-
-  PRIMARY KEY job_id (job_id),
-  KEY (job_cmd, job_namespace, job_title)
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
-
--- Details of updates to cached special pages
-CREATE TABLE /*$wgDBprefix*/querycache_info (
-
-  -- Special page name
-  -- Corresponds to a qc_type value
-  qci_type varchar(32) NOT NULL default '',
-
-  -- Timestamp of last update
-  qci_timestamp char(14) NOT NULL default '19700101000000',
-
-  UNIQUE KEY ( qci_type )
-
-) ENGINE=InnoDB;
-
--- For each redirect, this table contains exactly one row defining its target
-CREATE TABLE /*$wgDBprefix*/redirect (
-  -- Key to the page_id of the redirect page
-  rd_from int(8) unsigned NOT NULL default '0',
-
-  -- Key to page_namespace/page_title of the target page.
-  -- The target page may or may not exist, and due to renames
-  -- and deletions may refer to different page records as time
-  -- goes by.
-  rd_namespace int NOT NULL default '0',
-  rd_title varchar(255) binary NOT NULL default '',
-
-  PRIMARY KEY rd_from (rd_from),
-  KEY rd_ns_title (rd_namespace,rd_title,rd_from)
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
--- Used for caching expensive grouped queries that need two links (for example double-redirects)
-CREATE TABLE /*$wgDBprefix*/querycachetwo (
-  -- A key name, generally the base name of of the special page.
-  qcc_type char(32) NOT NULL,
-  
-  -- Some sort of stored value. Sizes, counts...
-  qcc_value int(5) unsigned NOT NULL default '0',
-  
-  -- Target namespace+title
-  qcc_namespace int NOT NULL default '0',
-  qcc_title char(255) binary NOT NULL default '',
-  
-  -- Target namespace+title2
-  qcc_namespacetwo int NOT NULL default '0',
-  qcc_titletwo char(255) binary NOT NULL default '',
-
-  KEY qcc_type (qcc_type,qcc_value),
-  KEY qcc_title (qcc_type,qcc_namespace,qcc_title),
-  KEY qcc_titletwo (qcc_type,qcc_namespacetwo,qcc_titletwo)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
-
---- Used for storing page restrictions (i.e. protection levels)
-CREATE TABLE /*$wgDBprefix*/page_restrictions (
-  -- Page to apply restrictions to (Foreign Key to page).
-  pr_page int(8) NOT NULL,
-  -- The protection type (edit, move, etc)
-  pr_type varchar(255) NOT NULL,
-  -- The protection level (Sysop, autoconfirmed, etc)
-  pr_level varchar(255) NOT NULL,
-  -- Whether or not to cascade the protection down to pages transcluded.
-  pr_cascade tinyint(4) NOT NULL,
-  -- Field for future support of per-user restriction.
-  pr_user int(8) NULL,
-  -- Field for time-limited protection.
-  pr_expiry char(14) binary NULL,
-  -- Field for an ID for this restrictions row (sort-key for Special:ProtectedPages)
-  pr_id int unsigned NOT NULL auto_increment,
-
-  PRIMARY KEY pr_pagetype (pr_page,pr_type),
-
-  KEY pr_page (pr_page),
-  KEY pr_typelevel (pr_type,pr_level),
-  KEY pr_level (pr_level),
-  KEY pr_cascade (pr_cascade)
-) ENGINE=InnoDB, DEFAULT CHARSET=binary;
diff --git a/maintenance/mysql5/tables.sql b/maintenance/mysql5/tables.sql
deleted file mode 100644
index 18b766f3ce..0000000000
--- a/maintenance/mysql5/tables.sql
+++ /dev/null
@@ -1,1149 +0,0 @@
--- Experimental table definitions for MySQL 4.1 and 5.0 with
--- explicit character set support. Not fully tested, may have
--- surprises!
---
--- TODO: Test various fields
--- TODO: Anything else need to be moved to VARBINARY and BLOB?
--- TODO: UCS-2 better than UTF-8?
--- TODO: Find out how to get 4-byte UTF-8 chars into MySQL...
---       An alternate UCS-2 that does UTF-16 conversion would work.
--- TODO: Work on collation usage
-
--- ------------------------------------------------------------
-
--- SQL to create the initial tables for the MediaWiki database.
--- This is read and executed by the install script; you should
--- not have to run it by itself unless doing a manual install.
-
---
--- General notes:
---
--- If possible, create tables as InnoDB to benefit from the
--- superior resiliency against crashes and ability to read
--- during writes (and write during reads!)
---
--- Only the 'searchindex' table requires MyISAM due to the
--- requirement for fulltext index support, which is missing
--- from InnoDB.
---
---
--- The MySQL table backend for MediaWiki currently uses
--- 14-character CHAR or VARCHAR fields to store timestamps.
--- The format is YYYYMMDDHHMMSS, which is derived from the
--- text format of MySQL's TIMESTAMP fields.
---
--- Historically TIMESTAMP fields were used, but abandoned
--- in early 2002 after a lot of trouble with the fields
--- auto-updating.
---
--- The Postgres backend uses DATETIME fields for timestamps,
--- and we will migrate the MySQL definitions at some point as
--- well.
---
---
--- The /*$wgDBprefix*/ comments in this and other files are
--- replaced with the defined table prefix by the installer
--- and updater scripts. If you are installing or running
--- updates manually, you will need to manually insert the
--- table prefix if any when running these scripts.
---
-
-
---
--- The user table contains basic account information,
--- authentication keys, etc.
---
--- Some multi-wiki sites may share a single central user table
--- between separate wikis using the $wgSharedDB setting.
---
--- Note that when a external authentication plugin is used,
--- user table entries still need to be created to store
--- preferences and to key tracking information in the other
--- tables.
---
-CREATE TABLE /*$wgDBprefix*/user (
-  user_id int(5) unsigned NOT NULL auto_increment,
-  
-  -- Usernames must be unique, must not be in the form of
-  -- an IP address. _Shouldn't_ allow slashes or case
-  -- conflicts. Spaces are allowed, and are _not_ converted
-  -- to underscores like titles. See the User::newFromName() for
-  -- the specific tests that usernames have to pass.
-  user_name varchar(255) binary NOT NULL default '',
-  
-  -- Optional 'real name' to be displayed in credit listings
-  user_real_name varchar(255) binary NOT NULL default '',
-  
-  -- Password hashes, normally hashed like so:
-  -- MD5(CONCAT(user_id,'-',MD5(plaintext_password))), see
-  -- wfEncryptPassword() in GlobalFunctions.php
-  user_password tinyblob NOT NULL,
-  
-  -- When using 'mail me a new password', a random
-  -- password is generated and the hash stored here.
-  -- The previous password is left in place until
-  -- someone actually logs in with the new password,
-  -- at which point the hash is moved to user_password
-  -- and the old password is invalidated.
-  user_newpassword tinyblob NOT NULL,
-
-  -- Timestamp of the last time when a new password was
-  -- sent, for throttling purposes
-  user_newpass_time char(14) binary,
-
-  -- Note: email should be restricted, not public info.
-  -- Same with passwords.
-  user_email tinytext NOT NULL,
-  
-  -- Newline-separated list of name=value defining the user
-  -- preferences
-  user_options blob NOT NULL,
-  
-  -- This is a timestamp which is updated when a user
-  -- logs in, logs out, changes preferences, or performs
-  -- some other action requiring HTML cache invalidation
-  -- to ensure that the UI is updated.
-  user_touched char(14) binary NOT NULL default '',
-  
-  -- A pseudorandomly generated value that is stored in
-  -- a cookie when the "remember password" feature is
-  -- used (previously, a hash of the password was used, but
-  -- this was vulnerable to cookie-stealing attacks)
-  user_token char(32) binary NOT NULL default '',
-  
-  -- Initially NULL; when a user's e-mail address has been
-  -- validated by returning with a mailed token, this is
-  -- set to the current timestamp.
-  user_email_authenticated char(14) binary,
-  
-  -- Randomly generated token created when the e-mail address
-  -- is set and a confirmation test mail sent.
-  user_email_token char(32) binary,
-  
-  -- Expiration date for the user_email_token
-  user_email_token_expires char(14) binary,
-
-  -- Timestamp of account registration.
-  -- Accounts predating this schema addition may contain NULL.
-  user_registration char(14) binary,
-  
-  -- Count of edits and edit-like actions.
-  --
-  -- *NOT* intended to be an accurate copy of COUNT(*) WHERE rev_user=user_id
-  -- May contain NULL for old accounts if batch-update scripts haven't been
-  -- run, as well as listing deleted edits and other myriad ways it could be
-  -- out of sync.
-  --
-  -- Meant primarily for heuristic checks to give an impression of whether
-  -- the account has been used much.
-  --
-  user_editcount int,
-
-  PRIMARY KEY user_id (user_id),
-  UNIQUE INDEX user_name (user_name),
-  INDEX (user_email_token)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- User permissions have been broken out to a separate table;
--- this allows sites with a shared user table to have different
--- permissions assigned to a user in each project.
---
--- This table replaces the old user_rights field which used a
--- comma-separated blob.
---
-CREATE TABLE /*$wgDBprefix*/user_groups (
-  -- Key to user_id
-  ug_user int(5) unsigned NOT NULL default '0',
-  
-  -- Group names are short symbolic string keys.
-  -- The set of group names is open-ended, though in practice
-  -- only some predefined ones are likely to be used.
-  --
-  -- At runtime $wgGroupPermissions will associate group keys
-  -- with particular permissions. A user will have the combined
-  -- permissions of any group they're explicitly in, plus
-  -- the implicit '*' and 'user' groups.
-  ug_group char(16) NOT NULL default '',
-  
-  PRIMARY KEY (ug_user,ug_group),
-  KEY (ug_group)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
--- Stores notifications of user talk page changes, for the display
--- of the "you have new messages" box
-CREATE TABLE /*$wgDBprefix*/user_newtalk (
-  -- Key to user.user_id
-  user_id int(5) NOT NULL default '0',
-  -- If the user is an anonymous user hir IP address is stored here
-  -- since the user_id of 0 is ambiguous
-  user_ip varchar(40) NOT NULL default '',
-  INDEX user_id (user_id),
-  INDEX user_ip (user_ip)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-
---
--- Core of the wiki: each page has an entry here which identifies
--- it by title and contains some essential metadata.
---
-CREATE TABLE /*$wgDBprefix*/page (
-  -- Unique identifier number. The page_id will be preserved across
-  -- edits and rename operations, but not deletions and recreations.
-  page_id int(8) unsigned NOT NULL auto_increment,
-  
-  -- A page name is broken into a namespace and a title.
-  -- The namespace keys are UI-language-independent constants,
-  -- defined in includes/Defines.php
-  page_namespace int NOT NULL,
-  
-  -- The rest of the title, as text.
-  -- Spaces are transformed into underscores in title storage.
-  page_title varchar(255) binary NOT NULL,
-  
-  -- Comma-separated set of permission keys indicating who
-  -- can move or edit the page.
-  page_restrictions tinyblob NOT NULL,
-  
-  -- Number of times this page has been viewed.
-  page_counter bigint(20) unsigned NOT NULL default '0',
-  
-  -- 1 indicates the article is a redirect.
-  page_is_redirect tinyint(1) unsigned NOT NULL default '0',
-  
-  -- 1 indicates this is a new entry, with only one edit.
-  -- Not all pages with one edit are new pages.
-  page_is_new tinyint(1) unsigned NOT NULL default '0',
-  
-  -- Random value between 0 and 1, used for Special:Randompage
-  page_random real unsigned NOT NULL,
-  
-  -- This timestamp is updated whenever the page changes in
-  -- a way requiring it to be re-rendered, invalidating caches.
-  -- Aside from editing this includes permission changes,
-  -- creation or deletion of linked pages, and alteration
-  -- of contained templates.
-  page_touched char(14) binary NOT NULL default '',
-
-  -- Handy key to revision.rev_id of the current revision.
-  -- This may be 0 during page creation, but that shouldn't
-  -- happen outside of a transaction... hopefully.
-  page_latest int(8) unsigned NOT NULL,
-  
-  -- Uncompressed length in bytes of the page's current source text.
-  page_len int(8) unsigned NOT NULL,
-
-  PRIMARY KEY page_id (page_id),
-  UNIQUE INDEX name_title (page_namespace,page_title),
-  
-  -- Special-purpose indexes
-  INDEX (page_random),
-  INDEX (page_len)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Every edit of a page creates also a revision row.
--- This stores metadata about the revision, and a reference
--- to the text storage backend.
---
-CREATE TABLE /*$wgDBprefix*/revision (
-  rev_id int(8) unsigned NOT NULL auto_increment,
-  
-  -- Key to page_id. This should _never_ be invalid.
-  rev_page int(8) unsigned NOT NULL,
-  
-  -- Key to text.old_id, where the actual bulk text is stored.
-  -- It's possible for multiple revisions to use the same text,
-  -- for instance revisions where only metadata is altered
-  -- or a rollback to a previous version.
-  rev_text_id int(8) unsigned NOT NULL,
-  
-  -- Text comment summarizing the change.
-  -- This text is shown in the history and other changes lists,
-  -- rendered in a subset of wiki markup by Linker::formatComment()
-  rev_comment tinyblob NOT NULL,
-  
-  -- Key to user.user_id of the user who made this edit.
-  -- Stores 0 for anonymous edits and for some mass imports.
-  rev_user int(5) unsigned NOT NULL default '0',
-  
-  -- Text username or IP address of the editor.
-  rev_user_text varchar(255) binary NOT NULL default '',
-  
-  -- Timestamp
-  rev_timestamp char(14) binary NOT NULL default '',
-  
-  -- Records whether the user marked the 'minor edit' checkbox.
-  -- Many automated edits are marked as minor.
-  rev_minor_edit tinyint(1) unsigned NOT NULL default '0',
-  
-  -- Not yet used; reserved for future changes to the deletion system.
-  rev_deleted tinyint(1) unsigned NOT NULL default '0',
-
-  -- Length of this revision in bytes
-  rev_len int(8) unsigned,
-
-  -- Key to revision.rev_id
-  -- This field is used to add support for a tree structure (The Adjacency List Model)
-  rev_parent_id int(8) unsigned default NULL,
-
-  PRIMARY KEY rev_page_id (rev_page, rev_id),
-  UNIQUE INDEX rev_id (rev_id),
-  INDEX rev_timestamp (rev_timestamp),
-  INDEX page_timestamp (rev_page,rev_timestamp),
-  INDEX user_timestamp (rev_user,rev_timestamp),
-  INDEX usertext_timestamp (rev_user_text,rev_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-
---
--- Holds text of individual page revisions.
---
--- Field names are a holdover from the 'old' revisions table in
--- MediaWiki 1.4 and earlier: an upgrade will transform that
--- table into the 'text' table to minimize unnecessary churning
--- and downtime. If upgrading, the other fields will be left unused.
---
-CREATE TABLE /*$wgDBprefix*/text (
-  -- Unique text storage key number.
-  -- Note that the 'oldid' parameter used in URLs does *not*
-  -- refer to this number anymore, but to rev_id.
-  --
-  -- revision.rev_text_id is a key to this column
-  old_id int(8) unsigned NOT NULL auto_increment,
-  
-  -- Depending on the contents of the old_flags field, the text
-  -- may be convenient plain text, or it may be funkily encoded.
-  old_text mediumblob NOT NULL,
-  
-  -- Comma-separated list of flags:
-  -- gzip: text is compressed with PHP's gzdeflate() function.
-  -- utf8: text was stored as UTF-8.
-  --       If $wgLegacyEncoding option is on, rows *without* this flag
-  --       will be converted to UTF-8 transparently at load time.
-  -- object: text field contained a serialized PHP object.
-  --         The object either contains multiple versions compressed
-  --         together to achieve a better compression ratio, or it refers
-  --         to another row where the text can be found.
-  old_flags tinyblob NOT NULL,
-  
-  PRIMARY KEY old_id (old_id)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Holding area for deleted articles, which may be viewed
--- or restored by admins through the Special:Undelete interface.
--- The fields generally correspond to the page, revision, and text
--- fields, with several caveats.
---
-CREATE TABLE /*$wgDBprefix*/archive (
-  ar_namespace int NOT NULL default '0',
-  ar_title varchar(255) binary NOT NULL default '',
-  
-  -- Newly deleted pages will not store text in this table,
-  -- but will reference the separately existing text rows.
-  -- This field is retained for backwards compatibility,
-  -- so old archived pages will remain accessible after
-  -- upgrading from 1.4 to 1.5.
-  -- Text may be gzipped or otherwise funky.
-  ar_text mediumblob NOT NULL,
-  
-  -- Basic revision stuff...
-  ar_comment tinyblob NOT NULL,
-  ar_user int(5) unsigned NOT NULL default '0',
-  ar_user_text varchar(255) binary NOT NULL,
-  ar_timestamp char(14) binary NOT NULL default '',
-  ar_minor_edit tinyint(1) NOT NULL default '0',
-  
-  -- See ar_text note.
-  ar_flags tinyblob NOT NULL,
-  
-  -- When revisions are deleted, their unique rev_id is stored
-  -- here so it can be retained after undeletion. This is necessary
-  -- to retain permalinks to given revisions after accidental delete
-  -- cycles or messy operations like history merges.
-  -- 
-  -- Old entries from 1.4 will be NULL here, and a new rev_id will
-  -- be created on undeletion for those revisions.
-  ar_rev_id int(8) unsigned,
-  
-  -- For newly deleted revisions, this is the text.old_id key to the
-  -- actual stored text. To avoid breaking the block-compression scheme
-  -- and otherwise making storage changes harder, the actual text is
-  -- *not* deleted from the text table, merely hidden by removal of the
-  -- page and revision entries.
-  --
-  -- Old entries deleted under 1.2-1.4 will have NULL here, and their
-  -- ar_text and ar_flags fields will be used to create a new text
-  -- row upon undeletion.
-  ar_text_id int(8) unsigned,
-  
-  -- rev_deleted for archives
-  ar_deleted tinyint(1) unsigned NOT NULL default '0',
-  -- Length of this revision in bytes
-  rev_len int(8) unsigned,
-    
-  KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-
---
--- Track page-to-page hyperlinks within the wiki.
---
-CREATE TABLE /*$wgDBprefix*/pagelinks (
-  -- Key to the page_id of the page containing the link.
-  pl_from int(8) unsigned NOT NULL default '0',
-  
-  -- Key to page_namespace/page_title of the target page.
-  -- The target page may or may not exist, and due to renames
-  -- and deletions may refer to different page records as time
-  -- goes by.
-  pl_namespace int NOT NULL default '0',
-  pl_title varchar(255) binary NOT NULL default '',
-  
-  UNIQUE KEY pl_from (pl_from,pl_namespace,pl_title),
-  KEY (pl_namespace,pl_title,pl_from)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-
---
--- Track template inclusions.
---
-CREATE TABLE /*$wgDBprefix*/templatelinks (
-  -- Key to the page_id of the page containing the link.
-  tl_from int(8) unsigned NOT NULL default '0',
-  
-  -- Key to page_namespace/page_title of the target page.
-  -- The target page may or may not exist, and due to renames
-  -- and deletions may refer to different page records as time
-  -- goes by.
-  tl_namespace int NOT NULL default '0',
-  tl_title varchar(255) binary NOT NULL default '',
-  
-  UNIQUE KEY tl_from (tl_from,tl_namespace,tl_title),
-  KEY (tl_namespace,tl_title,tl_from)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Track links to images *used inline*
--- We don't distinguish live from broken links here, so
--- they do not need to be changed on upload/removal.
---
-CREATE TABLE /*$wgDBprefix*/imagelinks (
-  -- Key to page_id of the page containing the image / media link.
-  il_from int(8) unsigned NOT NULL default '0',
-  
-  -- Filename of target image.
-  -- This is also the page_title of the file's description page;
-  -- all such pages are in namespace 6 (NS_IMAGE).
-  il_to varchar(255) binary NOT NULL default '',
-  
-  UNIQUE KEY il_from (il_from,il_to),
-  KEY (il_to,il_from)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Track category inclusions *used inline*
--- This tracks a single level of category membership
--- (folksonomic tagging, really).
---
-CREATE TABLE /*$wgDBprefix*/categorylinks (
-  -- Key to page_id of the page defined as a category member.
-  cl_from int(8) unsigned NOT NULL default '0',
-  
-  -- Name of the category.
-  -- This is also the page_title of the category's description page;
-  -- all such pages are in namespace 14 (NS_CATEGORY).
-  cl_to varchar(255) binary NOT NULL default '',
-  
-  -- The title of the linking page, or an optional override
-  -- to determine sort order. Sorting is by binary order, which
-  -- isn't always ideal, but collations seem to be an exciting
-  -- and dangerous new world in MySQL... The sortkey is updated
-  -- if no override exists and cl_from is renamed.
-  --
-  -- For MySQL 4.1+ with charset set to utf8, the sort key *index*
-  -- needs cut to be smaller than 1024 bytes (at 3 bytes per char).
-  -- To sort properly on the shorter key, this field needs to be
-  -- the same shortness.
-  cl_sortkey varchar(86) binary NOT NULL default '',
-  
-  -- This isn't really used at present. Provided for an optional
-  -- sorting method by approximate addition time.
-  cl_timestamp timestamp NOT NULL,
-  
-  UNIQUE KEY cl_from (cl_from,cl_to),
-  
-  -- We always sort within a given category...
-  KEY cl_sortkey (cl_to,cl_sortkey),
-  
-  -- Not really used?
-  KEY cl_timestamp (cl_to,cl_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Track links to external URLs
---
-CREATE TABLE /*$wgDBprefix*/externallinks (
-  -- page_id of the referring page
-  el_from int(8) unsigned NOT NULL default '0',
-
-  -- The URL
-  el_to blob NOT NULL,
-
-  -- In the case of HTTP URLs, this is the URL with any username or password
-  -- removed, and with the labels in the hostname reversed and converted to 
-  -- lower case. An extra dot is added to allow for matching of either
-  -- example.com or *.example.com in a single scan.
-  -- Example: 
-  --      http://user:password@sub.example.com/page.html
-  --   becomes
-  --      http://com.example.sub./page.html
-  -- which allows for fast searching for all pages under example.com with the
-  -- clause: 
-  --      WHERE el_index LIKE 'http://com.example.%'
-  el_index blob NOT NULL,
-  
-  KEY (el_from, el_to(40)),
-  KEY (el_to(60), el_from),
-  KEY (el_index(60))
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
--- 
--- Track interlanguage links
---
-CREATE TABLE /*$wgDBprefix*/langlinks (
-  -- page_id of the referring page
-  ll_from int(8) unsigned NOT NULL default '0',
-  
-  -- Language code of the target
-  ll_lang varchar(10) binary NOT NULL default '',
-
-  -- Title of the target, including namespace
-  ll_title varchar(255) binary NOT NULL default '',
-
-  UNIQUE KEY (ll_from, ll_lang),
-  KEY (ll_lang, ll_title)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Contains a single row with some aggregate info
--- on the state of the site.
---
-CREATE TABLE /*$wgDBprefix*/site_stats (
-  -- The single row should contain 1 here.
-  ss_row_id int(8) unsigned NOT NULL,
-  
-  -- Total number of page views, if hit counters are enabled.
-  ss_total_views bigint(20) unsigned default '0',
-  
-  -- Total number of edits performed.
-  ss_total_edits bigint(20) unsigned default '0',
-  
-  -- An approximate count of pages matching the following criteria:
-  -- * in namespace 0
-  -- * not a redirect
-  -- * contains the text '[['
-  -- See Article::isCountable() in includes/Article.php
-  ss_good_articles bigint(20) unsigned default '0',
-  
-  -- Total pages, theoretically equal to SELECT COUNT(*) FROM page; except faster
-  ss_total_pages bigint(20) default '-1',
-
-  -- Number of users, theoretically equal to SELECT COUNT(*) FROM user;
-  ss_users bigint(20) default '-1',
-
-  -- Deprecated, no longer updated as of 1.5
-  ss_admins int(10) default '-1',
-
-  -- Number of images, equivalent to SELECT COUNT(*) FROM image
-  ss_images int(10) default '0',
-
-  UNIQUE KEY ss_row_id (ss_row_id)
-
-) ENGINE=InnoDB;
-
---
--- Stores an ID for every time any article is visited;
--- depending on $wgHitcounterUpdateFreq, it is
--- periodically cleared and the page_counter column
--- in the page table updated for the all articles
--- that have been visited.)
---
-CREATE TABLE /*$wgDBprefix*/hitcounter (
-  hc_id int unsigned NOT NULL
-) ENGINE=HEAP MAX_ROWS=25000;
-
-
---
--- The internet is full of jerks, alas. Sometimes it's handy
--- to block a vandal or troll account.
---
-CREATE TABLE /*$wgDBprefix*/ipblocks (
-  -- Primary key, introduced for privacy.
-  ipb_id int(8) NOT NULL auto_increment,
-  
-  -- Blocked IP address in dotted-quad form or user name.
-  ipb_address tinyblob NOT NULL,
-  
-  -- Blocked user ID or 0 for IP blocks.
-  ipb_user int(8) unsigned NOT NULL default '0',
-  
-  -- User ID who made the block.
-  ipb_by int(8) unsigned NOT NULL default '0',
-  
-  -- Text comment made by blocker.
-  ipb_reason tinyblob NOT NULL,
-  
-  -- Creation (or refresh) date in standard YMDHMS form.
-  -- IP blocks expire automatically.
-  ipb_timestamp char(14) binary NOT NULL default '',
-  
-  -- Indicates that the IP address was banned because a banned
-  -- user accessed a page through it. If this is 1, ipb_address
-  -- will be hidden, and the block identified by block ID number.
-  ipb_auto bool NOT NULL default 0,
-
-  -- If set to 1, block applies only to logged-out users
-  ipb_anon_only bool NOT NULL default 0,
-
-  -- Block prevents account creation from matching IP addresses
-  ipb_create_account bool NOT NULL default 1,
-
-  -- Block triggers autoblocks
-  ipb_enable_autoblock bool NOT NULL default '1',
-  
-  -- Time at which the block will expire.
-  ipb_expiry char(14) binary NOT NULL default '',
-  
-  -- Start and end of an address range, in hexadecimal
-  -- Size chosen to allow IPv6
-  ipb_range_start tinyblob NOT NULL,
-  ipb_range_end tinyblob NOT NULL,
-  -- Flag for entries hidden from users and Sysops
-  ipb_deleted bool NOT NULL default 0,
-  
-  PRIMARY KEY ipb_id (ipb_id),
-
-  -- Unique index to support "user already blocked" messages
-  -- Any new options which prevent collisions should be included
-  UNIQUE INDEX ipb_address (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only),
-
-  INDEX ipb_user (ipb_user),
-  INDEX ipb_range (ipb_range_start(8), ipb_range_end(8)),
-  INDEX ipb_timestamp (ipb_timestamp),
-  INDEX ipb_expiry (ipb_expiry)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-
---
--- Uploaded images and other files.
---
-CREATE TABLE /*$wgDBprefix*/image (
-  -- Filename.
-  -- This is also the title of the associated description page,
-  -- which will be in namespace 6 (NS_IMAGE).
-  img_name varchar(255) binary NOT NULL default '',
-  
-  -- File size in bytes.
-  img_size int(8) unsigned NOT NULL default '0',
-  
-  -- For images, size in pixels.
-  img_width int(5) NOT NULL default '0',
-  img_height int(5) NOT NULL default '0',
-  
-  -- Extracted EXIF metadata stored as a serialized PHP array.
-  img_metadata mediumblob NOT NULL,
-  
-  -- For images, bits per pixel if known.
-  img_bits int(3) NOT NULL default '0',
-  
-  -- Media type as defined by the MEDIATYPE_xxx constants
-  img_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
-  
-  -- major part of a MIME media type as defined by IANA
-  -- see http://www.iana.org/assignments/media-types/
-  img_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") NOT NULL default "unknown",
-  
-  -- minor part of a MIME media type as defined by IANA
-  -- the minor parts are not required to adher to any standard
-  -- but should be consistent throughout the database
-  -- see http://www.iana.org/assignments/media-types/
-  img_minor_mime varchar(32) NOT NULL default "unknown",
-  
-  -- Description field as entered by the uploader.
-  -- This is displayed in image upload history and logs.
-  img_description tinyblob NOT NULL,
-  
-  -- user_id and user_name of uploader.
-  img_user int(5) unsigned NOT NULL default '0',
-  img_user_text varchar(255) binary NOT NULL,
-  
-  -- Time of the upload.
-  img_timestamp char(14) binary NOT NULL default '',
-  
-  PRIMARY KEY img_name (img_name),
-  
-  -- Used by Special:Imagelist for sort-by-size
-  INDEX img_size (img_size),
-
-  -- Used by Special:Newimages and Special:Imagelist
-  INDEX img_timestamp (img_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Previous revisions of uploaded files.
--- Awkwardly, image rows have to be moved into
--- this table at re-upload time.
---
-CREATE TABLE /*$wgDBprefix*/oldimage (
-  -- Base filename: key to image.img_name
-  oi_name varchar(255) binary NOT NULL default '',
-  
-  -- Filename of the archived file.
-  -- This is generally a timestamp and '!' prepended to the base name.
-  oi_archive_name varchar(255) binary NOT NULL default '',
-  
-  -- Other fields as in image...
-  oi_size int(8) unsigned NOT NULL default 0,
-  oi_width int(5) NOT NULL default 0,
-  oi_height int(5) NOT NULL default 0,
-  oi_bits int(3) NOT NULL default 0,
-  oi_description tinyblob NOT NULL,
-  oi_user int(5) unsigned NOT NULL default '0',
-  oi_user_text varchar(255) binary NOT NULL,
-  oi_timestamp char(14) binary NOT NULL default '',
-
-  INDEX oi_name (oi_name(10))
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Record of deleted file data
---
-CREATE TABLE /*$wgDBprefix*/filearchive (
-  -- Unique row id
-  fa_id int NOT NULL auto_increment,
-  
-  -- Original base filename; key to image.img_name, page.page_title, etc
-  fa_name varchar(255) binary NOT NULL default '',
-  
-  -- Filename of archived file, if an old revision
-  fa_archive_name varchar(255) binary default '',
-  
-  -- Which storage bin (directory tree or object store) the file data
-  -- is stored in. Should be 'deleted' for files that have been deleted;
-  -- any other bin is not yet in use.
-  fa_storage_group varchar(16),
-  
-  -- SHA-1 of the file contents plus extension, used as a key for storage.
-  -- eg 8f8a562add37052a1848ff7771a2c515db94baa9.jpg
-  --
-  -- If NULL, the file was missing at deletion time or has been purged
-  -- from the archival storage.
-  fa_storage_key varchar(64) binary default '',
-  
-  -- Deletion information, if this file is deleted.
-  fa_deleted_user int,
-  fa_deleted_timestamp char(14) binary default '',
-  fa_deleted_reason text,
-  
-  -- Visibility of deleted revisions, bitfield
-  fa_deleted tinyint(1) unsigned NOT NULL default '0',
-  
-  -- Duped fields from image
-  fa_size int(8) unsigned default '0',
-  fa_width int(5) default '0',
-  fa_height int(5) default '0',
-  fa_metadata mediumblob,
-  fa_bits int(3) default '0',
-  fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
-  fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") default "unknown",
-  fa_minor_mime varchar(32) default "unknown",
-  fa_description tinyblob,
-  fa_user int(5) unsigned default '0',
-  fa_user_text varchar(255) binary,
-  fa_timestamp char(14) binary default '',
-  
-  PRIMARY KEY (fa_id),
-  INDEX (fa_name, fa_timestamp),             -- pick out by image name
-  INDEX (fa_storage_group, fa_storage_key),  -- pick out dupe files
-  INDEX (fa_deleted_timestamp),              -- sort by deletion time
-  INDEX (fa_deleted_user)                    -- sort by deleter
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Primarily a summary table for Special:Recentchanges,
--- this table contains some additional info on edits from
--- the last few days, see Article::editUpdates()
---
-CREATE TABLE /*$wgDBprefix*/recentchanges (
-  rc_id int(8) NOT NULL auto_increment,
-  rc_timestamp varchar(14) binary NOT NULL default '',
-  rc_cur_time varchar(14) binary NOT NULL default '',
-  
-  -- As in revision
-  rc_user int(10) unsigned NOT NULL default '0',
-  rc_user_text varchar(255) binary NOT NULL,
-  
-  -- When pages are renamed, their RC entries do _not_ change.
-  rc_namespace int NOT NULL default '0',
-  rc_title varchar(255) binary NOT NULL default '',
-  
-  -- as in revision...
-  rc_comment varchar(255) binary NOT NULL default '',
-  rc_minor tinyint(3) unsigned NOT NULL default '0',
-  
-  -- Edits by user accounts with the 'bot' rights key are
-  -- marked with a 1 here, and will be hidden from the
-  -- default view.
-  rc_bot tinyint(3) unsigned NOT NULL default '0',
-  
-  rc_new tinyint(3) unsigned NOT NULL default '0',
-  
-  -- Key to page_id (was cur_id prior to 1.5).
-  -- This will keep links working after moves while
-  -- retaining the at-the-time name in the changes list.
-  rc_cur_id int(10) unsigned NOT NULL default '0',
-  
-  -- rev_id of the given revision
-  rc_this_oldid int(10) unsigned NOT NULL default '0',
-  
-  -- rev_id of the prior revision, for generating diff links.
-  rc_last_oldid int(10) unsigned NOT NULL default '0',
-  
-  -- These may no longer be used, with the new move log.
-  rc_type tinyint(3) unsigned NOT NULL default '0',
-  rc_moved_to_ns tinyint(3) unsigned NOT NULL default '0',
-  rc_moved_to_title varchar(255) binary NOT NULL default '',
-  
-  -- If the Recent Changes Patrol option is enabled,
-  -- users may mark edits as having been reviewed to
-  -- remove a warning flag on the RC list.
-  -- A value of 1 indicates the page has been reviewed.
-  rc_patrolled tinyint(3) unsigned NOT NULL default '0',
-  
-  -- Recorded IP address the edit was made from, if the
-  -- $wgPutIPinRC option is enabled.
-  rc_ip char(15) NOT NULL default '',
-
-  -- Text length in characters before
-  -- and after the edit
-  rc_old_len int(10),
-  rc_new_len int(10),
-
-  -- Visibility of deleted revisions, bitfield
-  rc_deleted tinyint(1) unsigned NOT NULL default '0',
-  
-  -- Value corresonding to log_id, specific log entries
-  rc_logid int(10) unsigned NOT NULL default '0',
-  -- Store log type info here, or null
-  rc_log_type varchar(255) binary NULL default NULL,
-  -- Store log action or null
-  rc_log_action varchar(255) binary NULL default NULL,
-  -- Log params
-  rc_params blob NOT NULL default '',
-  
-  PRIMARY KEY rc_id (rc_id),
-  INDEX rc_timestamp (rc_timestamp),
-  INDEX rc_namespace_title (rc_namespace, rc_title),
-  INDEX rc_cur_id (rc_cur_id),
-  INDEX new_name_timestamp (rc_new,rc_namespace,rc_timestamp),
-  INDEX rc_ip (rc_ip),
-  INDEX rc_ns_usertext (rc_namespace, rc_user_text),
-  INDEX rc_user_text (rc_user_text, rc_timestamp)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-CREATE TABLE /*$wgDBprefix*/watchlist (
-  -- Key to user.user_id
-  wl_user int(5) unsigned NOT NULL,
-  
-  -- Key to page_namespace/page_title
-  -- Note that users may watch pages which do not exist yet,
-  -- or existed in the past but have been deleted.
-  wl_namespace int NOT NULL default '0',
-  wl_title varchar(255) binary NOT NULL default '',
-  
-  -- Timestamp when user was last sent a notification e-mail;
-  -- cleared when the user visits the page.
-  wl_notificationtimestamp varchar(14) binary,
-  
-  UNIQUE KEY (wl_user, wl_namespace, wl_title),
-  KEY namespace_title (wl_namespace, wl_title)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-
---
--- Used by the math module to keep track
--- of previously-rendered items.
---
-CREATE TABLE /*$wgDBprefix*/math (
-  -- Binary MD5 hash of the latex fragment, used as an identifier key.
-  math_inputhash varbinary(16) NOT NULL,
-  
-  -- Not sure what this is, exactly...
-  math_outputhash varbinary(16) NOT NULL,
-  
-  -- texvc reports how well it thinks the HTML conversion worked;
-  -- if it's a low level the PNG rendering may be preferred.
-  math_html_conservativeness tinyint(1) NOT NULL,
-  
-  -- HTML output from texvc, if any
-  math_html text,
-  
-  -- MathML output from texvc, if any
-  math_mathml text,
-  
-  UNIQUE KEY math_inputhash (math_inputhash)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- When using the default MySQL search backend, page titles
--- and text are munged to strip markup, do Unicode case folding,
--- and prepare the result for MySQL's fulltext index.
---
--- This table must be MyISAM; InnoDB does not support the needed
--- fulltext index.
---
-CREATE TABLE /*$wgDBprefix*/searchindex (
-  -- Key to page_id
-  si_page int(8) unsigned NOT NULL,
-  
-  -- Munged version of title
-  si_title varchar(255) NOT NULL default '',
-  
-  -- Munged version of body text
-  si_text mediumtext NOT NULL,
-  
-  UNIQUE KEY (si_page),
-  FULLTEXT si_title (si_title),
-  FULLTEXT si_text (si_text)
-
-) ENGINE=MyISAM, DEFAULT CHARSET=utf8;
-
---
--- Recognized interwiki link prefixes
---
-CREATE TABLE /*$wgDBprefix*/interwiki (
-  -- The interwiki prefix, (e.g. "Meatball", or the language prefix "de")
-  iw_prefix char(32) NOT NULL,
-  
-  -- The URL of the wiki, with "$1" as a placeholder for an article name.
-  -- Any spaces in the name will be transformed to underscores before
-  -- insertion.
-  iw_url char(127) NOT NULL,
-  
-  -- A boolean value indicating whether the wiki is in this project
-  -- (used, for example, to detect redirect loops)
-  iw_local bool NOT NULL,
-  
-  -- Boolean value indicating whether interwiki transclusions are allowed.
-  iw_trans tinyint(1) NOT NULL default 0,
-  
-  UNIQUE KEY iw_prefix (iw_prefix)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Used for caching expensive grouped queries
---
-CREATE TABLE /*$wgDBprefix*/querycache (
-  -- A key name, generally the base name of of the special page.
-  qc_type char(32) NOT NULL,
-  
-  -- Some sort of stored value. Sizes, counts...
-  qc_value int(5) unsigned NOT NULL default '0',
-  
-  -- Target namespace+title
-  qc_namespace int NOT NULL default '0',
-  qc_title char(255) binary NOT NULL default '',
-  
-  KEY (qc_type,qc_value)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- For a few generic cache operations if not using Memcached
---
-CREATE TABLE /*$wgDBprefix*/objectcache (
-  keyname char(255) binary NOT NULL default '',
-  value mediumblob,
-  exptime datetime,
-  UNIQUE KEY (keyname),
-  KEY (exptime)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---
--- Cache of interwiki transclusion
---
-CREATE TABLE /*$wgDBprefix*/transcache (
-  tc_url varchar(255) NOT NULL,
-  tc_contents text,
-  tc_time int NOT NULL,
-  UNIQUE INDEX tc_url_idx (tc_url)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-CREATE TABLE /*$wgDBprefix*/logging (
-  -- Symbolic keys for the general log type and the action type
-  -- within the log. The output format will be controlled by the
-  -- action field, but only the type controls categorization.
-  log_type char(10) NOT NULL default '',
-  log_action char(10) NOT NULL default '',
-  
-  -- Timestamp. Duh.
-  log_timestamp char(14) NOT NULL default '19700101000000',
-  
-  -- The user who performed this action; key to user_id
-  log_user int unsigned NOT NULL default 0,
-  
-  -- Key to the page affected. Where a user is the target,
-  -- this will point to the user page.
-  log_namespace int NOT NULL default 0,
-  log_title varchar(255) binary NOT NULL default '',
-  
-  -- Freeform text. Interpreted as edit history comments.
-  log_comment varchar(255) NOT NULL default '',
-  
-  -- LF separated list of miscellaneous parameters
-  log_params blob NOT NULL,
-
-  -- Log ID, for referring to this specific log entry, probably for deletion and such.
-  log_id int unsigned NOT NULL auto_increment,
-
-  -- rev_deleted for logs
-  log_deleted tinyint(1) unsigned NOT NULL default '0',
-
-  KEY type_time (log_type, log_timestamp),
-  KEY user_time (log_user, log_timestamp),
-  KEY page_time (log_namespace, log_title, log_timestamp),
-  KEY times (log_timestamp)
-  
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-CREATE TABLE /*$wgDBprefix*/trackbacks (
-  tb_id int auto_increment,
-  tb_page int REFERENCES page(page_id) ON DELETE CASCADE,
-  tb_title varchar(255) NOT NULL,
-  tb_url varchar(255) NOT NULL,
-  tb_ex text,
-  tb_name varchar(255),
-
-  PRIMARY KEY (tb_id),
-  INDEX (tb_page)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-
--- Jobs performed by parallel apache threads or a command-line daemon
-CREATE TABLE /*$wgDBprefix*/job (
-  job_id int(9) unsigned NOT NULL auto_increment,
-  
-  -- Command name, currently only refreshLinks is defined
-  job_cmd varchar(255) NOT NULL default '',
-
-  -- Namespace and title to act on
-  -- Should be 0 and '' if the command does not operate on a title
-  job_namespace int NOT NULL,
-  job_title varchar(255) binary NOT NULL,
-
-  -- Any other parameters to the command
-  -- Presently unused, format undefined
-  job_params blob NOT NULL,
-
-  PRIMARY KEY job_id (job_id),
-  KEY (job_cmd, job_namespace, job_title)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
-
--- Details of updates to cached special pages
-CREATE TABLE /*$wgDBprefix*/querycache_info (
-
-  -- Special page name
-  -- Corresponds to a qc_type value
-  qci_type varchar(32) NOT NULL default '',
-
-  -- Timestamp of last update
-  qci_timestamp char(14) NOT NULL default '19700101000000',
-
-  UNIQUE KEY ( qci_type )
-
-) ENGINE=InnoDB;
-
--- For each redirect, this table contains exactly one row defining its target
-CREATE TABLE /*$wgDBprefix*/redirect (
-  -- Key to the page_id of the redirect page
-  rd_from int(8) unsigned NOT NULL default '0',
-
-  -- Key to page_namespace/page_title of the target page.
-  -- The target page may or may not exist, and due to renames
-  -- and deletions may refer to different page records as time
-  -- goes by.
-  rd_namespace int NOT NULL default '0',
-  rd_title varchar(255) binary NOT NULL default '',
-
-  PRIMARY KEY rd_from (rd_from),
-  KEY rd_ns_title (rd_namespace,rd_title,rd_from)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
--- Used for caching expensive grouped queries that need two links (for example double-redirects)
-CREATE TABLE /*$wgDBprefix*/querycachetwo (
-  -- A key name, generally the base name of of the special page.
-  qcc_type char(32) NOT NULL,
-  
-  -- Some sort of stored value. Sizes, counts...
-  qcc_value int(5) unsigned NOT NULL default '0',
-  
-  -- Target namespace+title
-  qcc_namespace int NOT NULL default '0',
-  qcc_title char(255) binary NOT NULL default '',
-  
-  -- Target namespace+title2
-  qcc_namespacetwo int NOT NULL default '0',
-  qcc_titletwo char(255) binary NOT NULL default '',
-
-  KEY qcc_type (qcc_type,qcc_value),
-  KEY qcc_title (qcc_type,qcc_namespace,qcc_title),
-  KEY qcc_titletwo (qcc_type,qcc_namespacetwo,qcc_titletwo)
-
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
-
---- Used for storing page restrictions (i.e. protection levels)
-CREATE TABLE /*$wgDBprefix*/page_restrictions (
-  -- Page to apply restrictions to (Foreign Key to page).
-  pr_page int(8) NOT NULL,
-  -- The protection type (edit, move, etc)
-  pr_type varchar(255) NOT NULL,
-  -- The protection level (Sysop, autoconfirmed, etc)
-  pr_level varchar(255) NOT NULL,
-  -- Whether or not to cascade the protection down to pages transcluded.
-  pr_cascade tinyint(4) NOT NULL,
-  -- Field for future support of per-user restriction.
-  pr_user int(8) NULL,
-  -- Field for time-limited protection.
-  pr_expiry char(14) binary NULL,
-  -- Field for an ID for this restrictions row (sort-key for Special:ProtectedPages)
-  pr_id int unsigned NOT NULL auto_increment,
-
-  PRIMARY KEY pr_pagetype (pr_page,pr_type),
-
-  KEY pr_page (pr_page),
-  KEY pr_typelevel (pr_type,pr_level),
-  KEY pr_level (pr_level),
-  KEY pr_cascade (pr_cascade)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
diff --git a/maintenance/sql.php b/maintenance/sql.php
new file mode 100644
index 0000000000..a536705ef8
--- /dev/null
+++ b/maintenance/sql.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Send SQL queries from the specified file to the database, performing
+ * variable replacement along the way.
+ */
+
+require_once( dirname(__FILE__) . '/' . 'commandLine.inc' );
+
+if ( isset( $options['help'] ) ) {
+	echo "Send SQL queries to a MediaWiki database.\nUsage: php sql.php [<file>]\n";
+	exit( 1 );
+}
+
+if ( isset( $args[0] ) ) {
+	$fileName = $args[0];
+	$file = fopen( $fileName, 'r' );
+	$promptCallback = false;
+} else {
+	$file = STDIN;
+	$promptObject = new SqlPromptPrinter( "> " );
+	$promptCallback = $promptObject->cb();
+}
+
+if ( !$file  ) {
+	echo "Unable to open input file\n";
+	exit( 1 );
+}
+
+$dbw =& wfGetDB( DB_MASTER );
+$error = $dbw->sourceStream( $file, $promptCallback, 'sqlPrintResult' );
+if ( $error !== true ) {
+	echo $error;
+	exit( 1 );
+} else {
+	exit( 0 );
+}
+
+//-----------------------------------------------------------------------------
+class SqlPromptPrinter {
+	function __construct( $prompt ) {
+		$this->prompt = $prompt;
+	}
+
+	function cb() {
+		return array( $this, 'printPrompt' );
+	}
+
+	function printPrompt() {
+		echo $this->prompt;
+	}
+}
+
+function sqlPrintResult( $res ) {
+	if ( !$res ) {
+		// Do nothing
+	} elseif ( $res->numRows() ) {
+		while ( $row = $res->fetchObject() ) {
+			print_r( $row );
+		}
+	} else {
+		$affected = $res->db->affectedRows();
+		echo "Query OK, $affected row(s) affected\n";
+	}
+}
+
+?>
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 35d090bcda..5d8b548109 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -130,7 +130,7 @@ CREATE TABLE /*$wgDBprefix*/user (
   UNIQUE INDEX user_name (user_name),
   INDEX (user_email_token)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- User permissions have been broken out to a separate table;
@@ -156,7 +156,7 @@ CREATE TABLE /*$wgDBprefix*/user_groups (
   
   PRIMARY KEY (ug_user,ug_group),
   KEY (ug_group)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 -- Stores notifications of user talk page changes, for the display
 -- of the "you have new messages" box
@@ -169,7 +169,7 @@ CREATE TABLE /*$wgDBprefix*/user_newtalk (
   INDEX user_id (user_id),
   INDEX user_ip (user_ip)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 --
@@ -229,7 +229,7 @@ CREATE TABLE /*$wgDBprefix*/page (
   INDEX (page_random),
   INDEX (page_len)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Every edit of a page creates also a revision row.
@@ -284,7 +284,7 @@ CREATE TABLE /*$wgDBprefix*/revision (
   INDEX user_timestamp (rev_user,rev_timestamp),
   INDEX usertext_timestamp (rev_user_text,rev_timestamp)
 
-) TYPE=InnoDB MAX_ROWS=10000000 AVG_ROW_LENGTH=1024;
+) /*$wgDBTableOptions*/ MAX_ROWS=10000000 AVG_ROW_LENGTH=1024;
 -- In case tables are created as MyISAM, use row hints for MySQL <5.0 to avoid 4GB limit
 
 --
@@ -320,7 +320,7 @@ CREATE TABLE /*$wgDBprefix*/text (
   
   PRIMARY KEY old_id (old_id)
 
-) TYPE=InnoDB MAX_ROWS=10000000 AVG_ROW_LENGTH=10240;
+) /*$wgDBTableOptions*/ MAX_ROWS=10000000 AVG_ROW_LENGTH=10240;
 -- In case tables are created as MyISAM, use row hints for MySQL <5.0 to avoid 4GB limit
 
 --
@@ -379,7 +379,7 @@ CREATE TABLE /*$wgDBprefix*/archive (
   
   KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 --
@@ -399,7 +399,7 @@ CREATE TABLE /*$wgDBprefix*/pagelinks (
   UNIQUE KEY pl_from (pl_from,pl_namespace,pl_title),
   KEY (pl_namespace,pl_title,pl_from)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 --
@@ -419,7 +419,7 @@ CREATE TABLE /*$wgDBprefix*/templatelinks (
   UNIQUE KEY tl_from (tl_from,tl_namespace,tl_title),
   KEY (tl_namespace,tl_title,tl_from)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Track links to images *used inline*
@@ -438,7 +438,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks (
   UNIQUE KEY il_from (il_from,il_to),
   KEY (il_to,il_from)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Track category inclusions *used inline*
@@ -478,7 +478,7 @@ CREATE TABLE /*$wgDBprefix*/categorylinks (
   -- Not really used?
   KEY cl_timestamp (cl_to,cl_timestamp)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Track links to external URLs
@@ -506,7 +506,7 @@ CREATE TABLE /*$wgDBprefix*/externallinks (
   KEY (el_from, el_to(40)),
   KEY (el_to(60), el_from),
   KEY (el_index(60))
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 -- 
 -- Track interlanguage links
@@ -523,7 +523,7 @@ CREATE TABLE /*$wgDBprefix*/langlinks (
 
   UNIQUE KEY (ll_from, ll_lang),
   KEY (ll_lang, ll_title)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Contains a single row with some aggregate info
@@ -560,7 +560,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats (
 
   UNIQUE KEY ss_row_id (ss_row_id)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Stores an ID for every time any article is visited;
@@ -634,7 +634,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks (
   INDEX ipb_timestamp (ipb_timestamp),
   INDEX ipb_expiry (ipb_expiry)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 --
@@ -691,7 +691,7 @@ CREATE TABLE /*$wgDBprefix*/image (
   -- Used by Special:Newimages and Special:Imagelist
   INDEX img_timestamp (img_timestamp)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Previous revisions of uploaded files.
@@ -718,7 +718,7 @@ CREATE TABLE /*$wgDBprefix*/oldimage (
 
   INDEX oi_name (oi_name(10))
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Record of deleted file data
@@ -773,7 +773,7 @@ CREATE TABLE /*$wgDBprefix*/filearchive (
   INDEX (fa_deleted_timestamp),              -- sort by deletion time
   INDEX (fa_deleted_user)                    -- sort by deleter
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Primarily a summary table for Special:Recentchanges,
@@ -856,7 +856,7 @@ CREATE TABLE /*$wgDBprefix*/recentchanges (
   INDEX rc_ns_usertext (rc_namespace, rc_user_text),
   INDEX rc_user_text (rc_user_text, rc_timestamp)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 CREATE TABLE /*$wgDBprefix*/watchlist (
   -- Key to user.user_id
@@ -875,7 +875,7 @@ CREATE TABLE /*$wgDBprefix*/watchlist (
   UNIQUE KEY (wl_user, wl_namespace, wl_title),
   KEY namespace_title (wl_namespace, wl_title)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 --
@@ -901,7 +901,7 @@ CREATE TABLE /*$wgDBprefix*/math (
   
   UNIQUE KEY math_inputhash (math_inputhash)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- When using the default MySQL search backend, page titles
@@ -948,7 +948,7 @@ CREATE TABLE /*$wgDBprefix*/interwiki (
   
   UNIQUE KEY iw_prefix (iw_prefix)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Used for caching expensive grouped queries
@@ -966,7 +966,7 @@ CREATE TABLE /*$wgDBprefix*/querycache (
   
   KEY (qc_type,qc_value)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- For a few generic cache operations if not using Memcached
@@ -978,7 +978,7 @@ CREATE TABLE /*$wgDBprefix*/objectcache (
   UNIQUE KEY (keyname),
   KEY (exptime)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --
 -- Cache of interwiki transclusion
@@ -988,7 +988,7 @@ CREATE TABLE /*$wgDBprefix*/transcache (
   tc_contents text,
   tc_time int NOT NULL,
   UNIQUE INDEX tc_url_idx (tc_url)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 CREATE TABLE /*$wgDBprefix*/logging (
   -- Symbolic keys for the general log type and the action type
@@ -1026,7 +1026,7 @@ CREATE TABLE /*$wgDBprefix*/logging (
   KEY page_time (log_namespace, log_title, log_timestamp),
   KEY times (log_timestamp)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 CREATE TABLE /*$wgDBprefix*/trackbacks (
   tb_id int auto_increment,
@@ -1038,7 +1038,7 @@ CREATE TABLE /*$wgDBprefix*/trackbacks (
 
   PRIMARY KEY (tb_id),
   INDEX (tb_page)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 -- Jobs performed by parallel apache threads or a command-line daemon
@@ -1059,7 +1059,7 @@ CREATE TABLE /*$wgDBprefix*/job (
 
   PRIMARY KEY job_id (job_id),
   KEY (job_cmd, job_namespace, job_title)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 
 -- Details of updates to cached special pages
@@ -1074,7 +1074,7 @@ CREATE TABLE /*$wgDBprefix*/querycache_info (
 
   UNIQUE KEY ( qci_type )
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 -- For each redirect, this table contains exactly one row defining its target
 CREATE TABLE /*$wgDBprefix*/redirect (
@@ -1090,7 +1090,7 @@ CREATE TABLE /*$wgDBprefix*/redirect (
 
   PRIMARY KEY rd_from (rd_from),
   KEY rd_ns_title (rd_namespace,rd_title,rd_from)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 -- Used for caching expensive grouped queries that need two links (for example double-redirects)
 CREATE TABLE /*$wgDBprefix*/querycachetwo (
@@ -1112,7 +1112,7 @@ CREATE TABLE /*$wgDBprefix*/querycachetwo (
   KEY qcc_title (qcc_type,qcc_namespace,qcc_title),
   KEY qcc_titletwo (qcc_type,qcc_namespacetwo,qcc_titletwo)
 
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 --- Used for storing page restrictions (i.e. protection levels)
 CREATE TABLE /*$wgDBprefix*/page_restrictions (
@@ -1138,6 +1138,6 @@ CREATE TABLE /*$wgDBprefix*/page_restrictions (
   KEY pr_typelevel (pr_type,pr_level),
   KEY pr_level (pr_level),
   KEY pr_cascade (pr_cascade)
-) TYPE=InnoDB;
+) /*$wgDBTableOptions*/;
 
 -- vim: sw=2 sts=2 et
-- 
2.20.1