From 0b25a247a1ddb9d3c698957ea768889ed4463e09 Mon Sep 17 00:00:00 2001 From: Domas Mituzas Date: Sun, 12 Mar 2006 14:35:03 +0000 Subject: [PATCH] replace TYPE= with ENGINE=, (supported since 4.0, TYPE deprecated since 4.1) --- includes/Article.php | 2 +- maintenance/FiveUpgrade.inc | 30 +++++----- maintenance/archives/patch-categorylinks.sql | 2 +- maintenance/archives/patch-externallinks.sql | 2 +- maintenance/archives/patch-hitcounter.sql | 2 +- maintenance/archives/patch-interwiki.sql | 2 +- maintenance/archives/patch-job.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 +- maintenance/archives/patch-pagelinks.sql | 2 +- maintenance/archives/patch-parsercache.sql | 2 +- maintenance/archives/patch-profiling.sql | 2 +- maintenance/archives/patch-querycache.sql | 2 +- maintenance/archives/patch-searchindex.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-usernewtalk.sql | 2 +- maintenance/archives/patch-validate.sql | 2 +- maintenance/archives/patch-watchlist.sql | 2 +- maintenance/archives/rebuildRecentchanges.inc | 2 +- maintenance/archives/upgradeWatchlist.php | 2 +- maintenance/build-intl-wiki.sql | 4 +- maintenance/mysql5/tables.sql | 58 +++++++++---------- maintenance/storage/blobs.sql | 2 +- maintenance/tables.sql | 56 +++++++++--------- maintenance/updaters.inc | 4 +- 32 files changed, 107 insertions(+), 107 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index e5ca9b7a7c..cd7ff017de 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -2455,7 +2455,7 @@ class Article { $old_user_abort = ignore_user_abort( true ); $dbw->query("LOCK TABLES $hitcounterTable WRITE"); - $dbw->query("CREATE TEMPORARY TABLE $acchitsTable TYPE=HEAP ". + $dbw->query("CREATE TEMPORARY TABLE $acchitsTable ENGINE=HEAP ". "SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable ". 'GROUP BY hc_id'); $dbw->query("DELETE FROM $hitcounterTable"); diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc index 861ad969c2..4378fa6324 100644 --- a/maintenance/FiveUpgrade.inc +++ b/maintenance/FiveUpgrade.inc @@ -356,7 +356,7 @@ class FiveUpgrade { UNIQUE INDEX name_title (page_namespace,page_title), INDEX (page_random), INDEX (page_len) - ) TYPE=InnoDB", $fname ); + ) ENGINE=InnoDB", $fname ); $this->dbw->query("CREATE TABLE $revision ( rev_id int(8) unsigned NOT NULL auto_increment, rev_page int(8) unsigned NOT NULL, @@ -374,7 +374,7 @@ class FiveUpgrade { INDEX page_timestamp (rev_page,rev_timestamp), INDEX user_timestamp (rev_user,rev_timestamp), INDEX usertext_timestamp (rev_user_text,rev_timestamp) - ) TYPE=InnoDB", $fname ); + ) ENGINE=InnoDB", $fname ); $maxold = intval( $this->dbw->selectField( 'old', 'max(old_id)', '', $fname ) ); $this->log( "Last old record is {$maxold}" ); @@ -525,7 +525,7 @@ CREATE TABLE $pagelinks ( UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title), KEY (pl_namespace,pl_title) -) TYPE=InnoDB" ); +) ENGINE=InnoDB" ); $this->log( 'Importing live links -> pagelinks' ); $nlinks = $this->dbw->selectField( 'links', 'count(*)', '', $fname ); @@ -608,7 +608,7 @@ CREATE TABLE $1 ( UNIQUE INDEX user_name (user_name), INDEX (user_email_token) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'user_id' => MW_UPGRADE_COPY, @@ -654,7 +654,7 @@ CREATE TABLE $1 ( PRIMARY KEY img_name (img_name), INDEX img_size (img_size), INDEX img_timestamp (img_timestamp) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'img_name' => MW_UPGRADE_ENCODE, @@ -831,7 +831,7 @@ CREATE TABLE $1 ( INDEX oi_name (oi_name(10)) -) TYPE=InnoDB; +) ENGINE=InnoDB; END; $fields = array( 'oi_name' => MW_UPGRADE_ENCODE, @@ -891,7 +891,7 @@ END; UNIQUE KEY (wl_user, wl_namespace, wl_title), KEY namespace_title (wl_namespace,wl_title) -) TYPE=InnoDB;", $fname ); +) ENGINE=InnoDB;", $fname ); // Fix encoding for Latin-1 upgrades, add some fields, // and double article to article+talk pairs @@ -960,7 +960,7 @@ CREATE TABLE $1 ( KEY user_time (log_user, log_timestamp), KEY page_time (log_namespace, log_title, log_timestamp) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'log_type' => MW_UPGRADE_COPY, @@ -994,7 +994,7 @@ CREATE TABLE $1 ( KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'ar_namespace' => MW_UPGRADE_COPY, @@ -1027,7 +1027,7 @@ CREATE TABLE $1 ( UNIQUE KEY il_from(il_from,il_to), KEY (il_to) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'il_from' => MW_UPGRADE_COPY, @@ -1049,7 +1049,7 @@ CREATE TABLE $1 ( UNIQUE KEY cl_from(cl_from,cl_to), KEY cl_sortkey(cl_to,cl_sortkey), KEY cl_timestamp(cl_to,cl_timestamp) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'cl_from' => MW_UPGRADE_COPY, @@ -1078,7 +1078,7 @@ CREATE TABLE $1 ( INDEX ipb_address (ipb_address), INDEX ipb_user (ipb_user) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'ipb_id' => MW_UPGRADE_COPY, @@ -1132,7 +1132,7 @@ CREATE TABLE $1 ( INDEX new_name_timestamp(rc_new,rc_namespace,rc_timestamp), INDEX rc_ip (rc_ip) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'rc_id' => MW_UPGRADE_COPY, @@ -1173,7 +1173,7 @@ CREATE TABLE $1 ( KEY (qc_type,qc_value) -) TYPE=InnoDB +) ENGINE=InnoDB END; $fields = array( 'qc_type' => MW_UPGRADE_COPY, @@ -1211,4 +1211,4 @@ END; } -?> \ No newline at end of file +?> diff --git a/maintenance/archives/patch-categorylinks.sql b/maintenance/archives/patch-categorylinks.sql index 53c82fc0db..c0bdd3153c 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-externallinks.sql b/maintenance/archives/patch-externallinks.sql index d1aa5764f0..aa2475de69 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-hitcounter.sql b/maintenance/archives/patch-hitcounter.sql index 260f717f03..50e56e0ce2 100644 --- a/maintenance/archives/patch-hitcounter.sql +++ b/maintenance/archives/patch-hitcounter.sql @@ -6,4 +6,4 @@ CREATE TABLE /*$wgDBprefix*/hitcounter ( hc_id INTEGER UNSIGNED NOT NULL -) TYPE=HEAP MAX_ROWS=25000; +) ENGINE=HEAP MAX_ROWS=25000; diff --git a/maintenance/archives/patch-interwiki.sql b/maintenance/archives/patch-interwiki.sql index 90b162ef3d..d2b4d8cf3d 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-job.sql b/maintenance/archives/patch-job.sql index 89918456be..bdc761b79c 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-linkscc.sql b/maintenance/archives/patch-linkscc.sql index 91d4da56bc..a152fbb47d 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-linktables.sql b/maintenance/archives/patch-linktables.sql index bb9bd03350..ec1021b7ab 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; +) ENGINE=InnoDB; -- -- 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; +) ENGINE=InnoDB; -- -- 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; +) ENGINE=InnoDB; -- -- 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-logging.sql b/maintenance/archives/patch-logging.sql index 79bb53b52d..27f192ea15 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; +) ENGINE=InnoDB; -- 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..0e01564a2b 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-objectcache.sql b/maintenance/archives/patch-objectcache.sql index 18572aa099..5c74ba9277 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-pagelinks.sql b/maintenance/archives/patch-pagelinks.sql index 7240cff967..0cdbcd8779 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; +) ENGINE=InnoDB; -- Import existing-page links diff --git a/maintenance/archives/patch-parsercache.sql b/maintenance/archives/patch-parsercache.sql index 854e6c57ce..5284997aab 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-profiling.sql b/maintenance/archives/patch-profiling.sql index 30d5322776..3e930fb72d 100644 --- a/maintenance/archives/patch-profiling.sql +++ b/maintenance/archives/patch-profiling.sql @@ -6,4 +6,4 @@ CREATE TABLE /*$wgDBprefix*/profiling ( pf_time float not null default 0, pf_name varchar(255) not null default '', UNIQUE KEY pf_name (pf_name) -) TYPE=HEAP; +) ENGINE=HEAP; diff --git a/maintenance/archives/patch-querycache.sql b/maintenance/archives/patch-querycache.sql index 7df9129e93..b0a5e3b4e0 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-searchindex.sql b/maintenance/archives/patch-searchindex.sql index fb54dbbe55..0e7f395b19 100644 --- a/maintenance/archives/patch-searchindex.sql +++ b/maintenance/archives/patch-searchindex.sql @@ -19,7 +19,7 @@ CREATE TABLE /*$wgDBprefix*/searchindex ( UNIQUE KEY (si_page) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- Copying data into new table... INSERT INTO /*$wgDBprefix*/searchindex diff --git a/maintenance/archives/patch-templatelinks.sql b/maintenance/archives/patch-templatelinks.sql index 49bd9c5ef2..47d6ac956a 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-transcache.sql b/maintenance/archives/patch-transcache.sql index a244bff898..94e0a97fbc 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-user_groups.sql b/maintenance/archives/patch-user_groups.sql index 50f9999355..af79d4638f 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-user_rights.sql b/maintenance/archives/patch-user_rights.sql index 36f0102a78..640320e425 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; +) ENGINE=InnoDB; 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..1d61286c14 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; +) ENGINE=InnoDB; -- 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-usernewtalk.sql b/maintenance/archives/patch-usernewtalk.sql index fb8c865571..4307dde776 100644 --- a/maintenance/archives/patch-usernewtalk.sql +++ b/maintenance/archives/patch-usernewtalk.sql @@ -9,7 +9,7 @@ CREATE TABLE /*$wgDBprefix*/user_newtalk ( user_ip varchar(40) NOT NULL default '', KEY user_id (user_id), KEY user_ip (user_ip) -) TYPE=MyISAM; +) ENGINE=MyISAM; INSERT INTO /*$wgDBprefix*/user_newtalk (user_id, user_ip) diff --git a/maintenance/archives/patch-validate.sql b/maintenance/archives/patch-validate.sql index 3fa7e844ec..5d7a16d637 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; +) ENGINE=InnoDB; diff --git a/maintenance/archives/patch-watchlist.sql b/maintenance/archives/patch-watchlist.sql index adee010b67..f491c53863 100644 --- a/maintenance/archives/patch-watchlist.sql +++ b/maintenance/archives/patch-watchlist.sql @@ -14,7 +14,7 @@ CREATE TABLE watchlist2 ( wl_namespace tinyint(2) unsigned NOT NULL default '0', wl_title varchar(255) binary NOT NULL default '', UNIQUE KEY (wl_user, wl_namespace, wl_title) -) TYPE=MyISAM PACK_KEYS=1; +) ENGINE=MyISAM PACK_KEYS=1; INSERT INTO watchlist2 (wl_user,wl_namespace,wl_title) SELECT DISTINCT wl_user,(cur_namespace | 1) - 1,cur_title diff --git a/maintenance/archives/rebuildRecentchanges.inc b/maintenance/archives/rebuildRecentchanges.inc index 54f6cb38c6..f61d6821e7 100644 --- a/maintenance/archives/rebuildRecentchanges.inc +++ b/maintenance/archives/rebuildRecentchanges.inc @@ -31,7 +31,7 @@ function rebuildRecentChangesTable() INDEX rc_timestamp (rc_timestamp), INDEX rc_namespace (rc_namespace), INDEX rc_title (rc_title) -) TYPE=MyISAM PACK_KEYS=1;"; +) ENGINE=MyISAM PACK_KEYS=1;"; wfQuery( $sql ); print( "Loading from CUR table...\n" ); diff --git a/maintenance/archives/upgradeWatchlist.php b/maintenance/archives/upgradeWatchlist.php index b4605a5007..67e328f131 100644 --- a/maintenance/archives/upgradeWatchlist.php +++ b/maintenance/archives/upgradeWatchlist.php @@ -30,7 +30,7 @@ $sql = "CREATE TABLE watchlist ( wl_user int(5) unsigned NOT NULL, wl_page int(8) unsigned NOT NULL, UNIQUE KEY (wl_user, wl_page) -) TYPE=MyISAM PACK_KEYS=1"; +) ENGINE=MyISAM PACK_KEYS=1"; wfQuery( $sql, DB_MASTER ); $lc = new LinkCache; diff --git a/maintenance/build-intl-wiki.sql b/maintenance/build-intl-wiki.sql index f094c8b788..0d3f6b7df9 100644 --- a/maintenance/build-intl-wiki.sql +++ b/maintenance/build-intl-wiki.sql @@ -19,13 +19,13 @@ CREATE TABLE ilinks ( title_from tinyblob, title_to tinyblob, target_exists tinyint(1) default NULL -) TYPE=MyISAM; +) ENGINE=MyISAM; CREATE TABLE recentchanges ( user_name tinyblob, user_lang varchar(5) default NULL, date timestamp(14) NOT NULL, message tinyblob -) TYPE=MyISAM; +) ENGINE=MyISAM; diff --git a/maintenance/mysql5/tables.sql b/maintenance/mysql5/tables.sql index 9fb2f33543..2f0999ce7c 100644 --- a/maintenance/mysql5/tables.sql +++ b/maintenance/mysql5/tables.sql @@ -127,7 +127,7 @@ CREATE TABLE /*$wgDBprefix*/user ( UNIQUE INDEX user_name (user_name), INDEX (user_email_token) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- User permissions have been broken out to a separate table; @@ -153,7 +153,7 @@ CREATE TABLE /*$wgDBprefix*/user_groups ( PRIMARY KEY (ug_user,ug_group), KEY (ug_group) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- Stores notifications of user talk page changes, for the display -- of the "you have new messages" box @@ -165,7 +165,7 @@ CREATE TABLE /*$wgDBprefix*/user_newtalk ( user_ip varchar(40) NOT NULL default '', INDEX user_id (user_id), INDEX user_ip (user_ip) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- @@ -225,7 +225,7 @@ CREATE TABLE /*$wgDBprefix*/page ( INDEX (page_random), INDEX (page_len) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- Every edit of a page creates also a revision row. @@ -273,7 +273,7 @@ CREATE TABLE /*$wgDBprefix*/revision ( INDEX user_timestamp (rev_user,rev_timestamp), INDEX usertext_timestamp (rev_user_text,rev_timestamp) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- @@ -309,7 +309,7 @@ CREATE TABLE /*$wgDBprefix*/text ( PRIMARY KEY old_id (old_id) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- Holding area for deleted articles, which may be viewed @@ -361,7 +361,7 @@ CREATE TABLE /*$wgDBprefix*/archive ( KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- @@ -381,7 +381,7 @@ CREATE TABLE /*$wgDBprefix*/pagelinks ( UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title), KEY (pl_namespace,pl_title) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- @@ -401,7 +401,7 @@ CREATE TABLE /*$wgDBprefix*/templatelinks ( UNIQUE KEY tl_from(tl_from,tl_namespace,tl_title), KEY (tl_namespace,tl_title) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- @@ -421,7 +421,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks ( UNIQUE KEY il_from(il_from,il_to), KEY (il_to) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- Track category inclusions *used inline* @@ -460,7 +460,7 @@ CREATE TABLE /*$wgDBprefix*/categorylinks ( -- Not really used? KEY cl_timestamp(cl_to,cl_timestamp) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- Track links to external URLs @@ -488,7 +488,7 @@ CREATE TABLE /*$wgDBprefix*/externallinks ( KEY (el_from, el_to(40)), KEY (el_to(60), el_from), KEY (el_index(60)) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- Contains a single row with some aggregate info @@ -522,7 +522,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats ( UNIQUE KEY ss_row_id (ss_row_id) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Stores an ID for every time any article is visited; @@ -533,7 +533,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats ( -- CREATE TABLE /*$wgDBprefix*/hitcounter ( hc_id INTEGER UNSIGNED NOT NULL -) TYPE=HEAP MAX_ROWS=25000; +) ENGINE=HEAP MAX_ROWS=25000; -- @@ -578,7 +578,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks ( INDEX ipb_user (ipb_user), INDEX ipb_range (ipb_range_start(8), ipb_range_end(8)) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- @@ -635,7 +635,7 @@ CREATE TABLE /*$wgDBprefix*/image ( -- Used by Special:Newimages and Special:Imagelist INDEX img_timestamp (img_timestamp) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- Previous revisions of uploaded files. @@ -662,7 +662,7 @@ CREATE TABLE /*$wgDBprefix*/oldimage ( INDEX oi_name (oi_name(10)) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- @@ -727,7 +727,7 @@ CREATE TABLE /*$wgDBprefix*/recentchanges ( INDEX new_name_timestamp(rc_new,rc_namespace,rc_timestamp), INDEX rc_ip (rc_ip) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; CREATE TABLE /*$wgDBprefix*/watchlist ( -- Key to user.user_id @@ -746,7 +746,7 @@ CREATE TABLE /*$wgDBprefix*/watchlist ( UNIQUE KEY (wl_user, wl_namespace, wl_title), KEY namespace_title (wl_namespace,wl_title) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- @@ -772,7 +772,7 @@ CREATE TABLE /*$wgDBprefix*/math ( UNIQUE KEY math_inputhash (math_inputhash) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- When using the default MySQL search backend, page titles @@ -796,7 +796,7 @@ CREATE TABLE /*$wgDBprefix*/searchindex ( FULLTEXT si_title (si_title), FULLTEXT si_text (si_text) -) TYPE=MyISAM, DEFAULT CHARSET=utf8; +) ENGINE=MyISAM, DEFAULT CHARSET=utf8; -- -- Recognized interwiki link prefixes @@ -819,7 +819,7 @@ CREATE TABLE /*$wgDBprefix*/interwiki ( UNIQUE KEY iw_prefix (iw_prefix) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- Used for caching expensive grouped queries @@ -837,7 +837,7 @@ CREATE TABLE /*$wgDBprefix*/querycache ( KEY (qc_type,qc_value) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- For a few generic cache operations if not using Memcached @@ -849,7 +849,7 @@ CREATE TABLE /*$wgDBprefix*/objectcache ( unique key (keyname), key (exptime) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- -- Cache of interwiki transclusion @@ -859,7 +859,7 @@ CREATE TABLE /*$wgDBprefix*/transcache ( tc_contents TEXT, tc_time INT NOT NULL, UNIQUE INDEX tc_url_idx(tc_url) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- For article validation CREATE TABLE /*$wgDBprefix*/validate ( @@ -871,7 +871,7 @@ 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, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; CREATE TABLE /*$wgDBprefix*/logging ( @@ -902,7 +902,7 @@ CREATE TABLE /*$wgDBprefix*/logging ( KEY user_time (log_user, log_timestamp), KEY page_time (log_namespace, log_title, log_timestamp) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; CREATE TABLE /*$wgDBprefix*/trackbacks ( tb_id integer AUTO_INCREMENT PRIMARY KEY, @@ -913,7 +913,7 @@ CREATE TABLE /*$wgDBprefix*/trackbacks ( tb_name varchar(255), INDEX (tb_page) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; -- Jobs performed by parallel apache threads or a command-line daemon CREATE TABLE /*$wgDBprefix*/job ( @@ -933,4 +933,4 @@ CREATE TABLE /*$wgDBprefix*/job ( PRIMARY KEY job_id (job_id), KEY (job_cmd, job_namespace, job_title) -) TYPE=InnoDB, DEFAULT CHARSET=utf8; +) ENGINE=InnoDB, DEFAULT CHARSET=utf8; diff --git a/maintenance/storage/blobs.sql b/maintenance/storage/blobs.sql index 5782ac47b7..c0054eb72b 100644 --- a/maintenance/storage/blobs.sql +++ b/maintenance/storage/blobs.sql @@ -4,5 +4,5 @@ CREATE TABLE /*$wgDBprefix*/blobs ( blob_id int(8) NOT NULL AUTO_INCREMENT, blob_text mediumtext, PRIMARY KEY (blob_id) -) TYPE=InnoDB; +) ENGINE=InnoDB; diff --git a/maintenance/tables.sql b/maintenance/tables.sql index b3581d25cd..9053646d5a 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -114,7 +114,7 @@ CREATE TABLE /*$wgDBprefix*/user ( UNIQUE INDEX user_name (user_name), INDEX (user_email_token) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- User permissions have been broken out to a separate table; @@ -140,7 +140,7 @@ CREATE TABLE /*$wgDBprefix*/user_groups ( PRIMARY KEY (ug_user,ug_group), KEY (ug_group) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- Stores notifications of user talk page changes, for the display -- of the "you have new messages" box @@ -212,7 +212,7 @@ CREATE TABLE /*$wgDBprefix*/page ( INDEX (page_random), INDEX (page_len) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Every edit of a page creates also a revision row. @@ -260,7 +260,7 @@ CREATE TABLE /*$wgDBprefix*/revision ( INDEX user_timestamp (rev_user,rev_timestamp), INDEX usertext_timestamp (rev_user_text,rev_timestamp) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- @@ -296,7 +296,7 @@ CREATE TABLE /*$wgDBprefix*/text ( PRIMARY KEY old_id (old_id) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Holding area for deleted articles, which may be viewed @@ -348,7 +348,7 @@ CREATE TABLE /*$wgDBprefix*/archive ( KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- @@ -368,7 +368,7 @@ CREATE TABLE /*$wgDBprefix*/pagelinks ( UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title), KEY (pl_namespace,pl_title) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- @@ -388,7 +388,7 @@ CREATE TABLE /*$wgDBprefix*/templatelinks ( UNIQUE KEY tl_from(tl_from,tl_namespace,tl_title), KEY (tl_namespace,tl_title) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Track links to images *used inline* @@ -407,7 +407,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks ( UNIQUE KEY il_from(il_from,il_to), KEY (il_to) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Track category inclusions *used inline* @@ -447,7 +447,7 @@ CREATE TABLE /*$wgDBprefix*/categorylinks ( -- Not really used? KEY cl_timestamp(cl_to,cl_timestamp) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Track links to external URLs @@ -475,7 +475,7 @@ CREATE TABLE /*$wgDBprefix*/externallinks ( KEY (el_from, el_to(40)), KEY (el_to(60), el_from), KEY (el_index(60)) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Contains a single row with some aggregate info @@ -509,7 +509,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats ( UNIQUE KEY ss_row_id (ss_row_id) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Stores an ID for every time any article is visited; @@ -520,7 +520,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats ( -- CREATE TABLE /*$wgDBprefix*/hitcounter ( hc_id INTEGER UNSIGNED NOT NULL -) TYPE=HEAP MAX_ROWS=25000; +) ENGINE=HEAP MAX_ROWS=25000; -- @@ -565,7 +565,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks ( INDEX ipb_user (ipb_user), INDEX ipb_range (ipb_range_start(8), ipb_range_end(8)) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- @@ -622,7 +622,7 @@ CREATE TABLE /*$wgDBprefix*/image ( -- Used by Special:Newimages and Special:Imagelist INDEX img_timestamp (img_timestamp) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Previous revisions of uploaded files. @@ -649,7 +649,7 @@ CREATE TABLE /*$wgDBprefix*/oldimage ( INDEX oi_name (oi_name(10)) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- @@ -714,7 +714,7 @@ CREATE TABLE /*$wgDBprefix*/recentchanges ( INDEX new_name_timestamp(rc_new,rc_namespace,rc_timestamp), INDEX rc_ip (rc_ip) -) TYPE=InnoDB; +) ENGINE=InnoDB; CREATE TABLE /*$wgDBprefix*/watchlist ( -- Key to user.user_id @@ -733,7 +733,7 @@ CREATE TABLE /*$wgDBprefix*/watchlist ( UNIQUE KEY (wl_user, wl_namespace, wl_title), KEY namespace_title (wl_namespace,wl_title) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- @@ -759,7 +759,7 @@ CREATE TABLE /*$wgDBprefix*/math ( UNIQUE KEY math_inputhash (math_inputhash) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- When using the default MySQL search backend, page titles @@ -783,7 +783,7 @@ CREATE TABLE /*$wgDBprefix*/searchindex ( FULLTEXT si_title (si_title), FULLTEXT si_text (si_text) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Recognized interwiki link prefixes @@ -806,7 +806,7 @@ CREATE TABLE /*$wgDBprefix*/interwiki ( UNIQUE KEY iw_prefix (iw_prefix) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Used for caching expensive grouped queries @@ -824,7 +824,7 @@ CREATE TABLE /*$wgDBprefix*/querycache ( KEY (qc_type,qc_value) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- For a few generic cache operations if not using Memcached @@ -836,7 +836,7 @@ CREATE TABLE /*$wgDBprefix*/objectcache ( unique key (keyname), key (exptime) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- -- Cache of interwiki transclusion @@ -846,7 +846,7 @@ CREATE TABLE /*$wgDBprefix*/transcache ( tc_contents TEXT, tc_time INT NOT NULL, UNIQUE INDEX tc_url_idx(tc_url) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- For article validation CREATE TABLE /*$wgDBprefix*/validate ( @@ -858,7 +858,7 @@ 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; +) ENGINE=InnoDB; CREATE TABLE /*$wgDBprefix*/logging ( @@ -890,7 +890,7 @@ CREATE TABLE /*$wgDBprefix*/logging ( KEY page_time (log_namespace, log_title, log_timestamp), KEY times (log_timestamp) -) TYPE=InnoDB; +) ENGINE=InnoDB; CREATE TABLE /*$wgDBprefix*/trackbacks ( tb_id integer AUTO_INCREMENT PRIMARY KEY, @@ -901,7 +901,7 @@ CREATE TABLE /*$wgDBprefix*/trackbacks ( tb_name varchar(255), INDEX (tb_page) -) TYPE=InnoDB; +) ENGINE=InnoDB; -- Jobs performed by parallel apache threads or a command-line daemon @@ -922,4 +922,4 @@ CREATE TABLE /*$wgDBprefix*/job ( PRIMARY KEY job_id (job_id), KEY (job_cmd, job_namespace, job_title) -) TYPE=InnoDB; +) ENGINE=InnoDB; diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index 4d532b01b6..622b4df41c 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -389,7 +389,7 @@ function do_schema_restructuring() { UNIQUE INDEX name_title (page_namespace,page_title), INDEX (page_random), INDEX (page_len) - ) TYPE=InnoDB", $fname ); + ) ENGINE=InnoDB", $fname ); $wgDatabase->query("CREATE TABLE $revision ( rev_id int(8) unsigned NOT NULL auto_increment, rev_page int(8) unsigned NOT NULL, @@ -406,7 +406,7 @@ function do_schema_restructuring() { INDEX page_timestamp (rev_page,rev_timestamp), INDEX user_timestamp (rev_user,rev_timestamp), INDEX usertext_timestamp (rev_user_text,rev_timestamp) - ) TYPE=InnoDB", $fname ); + ) ENGINE=InnoDB", $fname ); echo wfTimestamp(); echo "......Locking tables.\n"; -- 2.20.1