put TYPE back in, now as it's back in 5.1 ;-)

diff --git a/includes/Article.php b/includes/Article.php
index 2d5dabc..cbce67a 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2506,7 +2506,7 @@ class Article {
                        $old_user_abort = ignore_user_abort( true );
 
                        $dbw->query("LOCK TABLES $hitcounterTable WRITE");
-                       $dbw->query("CREATE TEMPORARY TABLE $acchitsTable ENGINE=HEAP ".
+                       $dbw->query("CREATE TEMPORARY TABLE $acchitsTable TYPE=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 4378fa6..8f172c9 100644 (file)
--- 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)
-                       ) ENGINE=InnoDB", $fname );
+                       ) TYPE=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)
-                       ) ENGINE=InnoDB", $fname );
+                       ) TYPE=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)
 
-) ENGINE=InnoDB" );
+) TYPE=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)
 
-) ENGINE=InnoDB
+) TYPE=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)
-) ENGINE=InnoDB
+) TYPE=InnoDB
 END;
                $fields = array(
                        'img_name'        => MW_UPGRADE_ENCODE,
@@ -831,7 +831,7 @@ CREATE TABLE $1 (
 
   INDEX oi_name (oi_name(10))
 
-) ENGINE=InnoDB;
+) TYPE=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)
 
-) ENGINE=InnoDB;", $fname );
+) TYPE=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)
 
-) ENGINE=InnoDB
+) TYPE=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)
 
-) ENGINE=InnoDB
+) TYPE=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)
 
-) ENGINE=InnoDB
+) TYPE=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)
-) ENGINE=InnoDB
+) TYPE=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)
 
-) ENGINE=InnoDB
+) TYPE=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)
 
-) ENGINE=InnoDB
+) TYPE=InnoDB
 END;
                $fields = array(
                        'rc_id'             => MW_UPGRADE_COPY,
@@ -1173,7 +1173,7 @@ CREATE TABLE $1 (
 
   KEY (qc_type,qc_value)
 
-) ENGINE=InnoDB
+) TYPE=InnoDB
 END;
                $fields = array(
                        'qc_type'      => MW_UPGRADE_COPY,

diff --git a/maintenance/archives/patch-categorylinks.sql b/maintenance/archives/patch-categorylinks.sql
index c0bdd31..53c82fc 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-externallinks.sql b/maintenance/archives/patch-externallinks.sql
index aa2475d..d1aa576 100644 (file)
--- 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))
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 

diff --git a/maintenance/archives/patch-hitcounter.sql b/maintenance/archives/patch-hitcounter.sql
index 50e56e0..260f717 100644 (file)
--- 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
-) ENGINE=HEAP MAX_ROWS=25000;
+) TYPE=HEAP MAX_ROWS=25000;

diff --git a/maintenance/archives/patch-interwiki.sql b/maintenance/archives/patch-interwiki.sql
index d2b4d8c..90b162e 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-job.sql b/maintenance/archives/patch-job.sql
index bdc761b..8991845 100644 (file)
--- 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)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-linkscc.sql b/maintenance/archives/patch-linkscc.sql
index a152fbb..91d4da5 100644 (file)
--- 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
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-linktables.sql b/maintenance/archives/patch-linktables.sql
index ec1021b..bb9bd03 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=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)
 
-) ENGINE=InnoDB;
+) TYPE=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)
 
-) ENGINE=InnoDB;
+) TYPE=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
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-logging.sql b/maintenance/archives/patch-logging.sql
index 27f192e..79bb53b 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=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 0e01564..aee24a8 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-objectcache.sql b/maintenance/archives/patch-objectcache.sql
index 5c74ba9..18572aa 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-pagelinks.sql b/maintenance/archives/patch-pagelinks.sql
index 0cdbcd8..7240cff 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 -- Import existing-page links

diff --git a/maintenance/archives/patch-parsercache.sql b/maintenance/archives/patch-parsercache.sql
index 5284997..854e6c5 100644 (file)
--- 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)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-profiling.sql b/maintenance/archives/patch-profiling.sql
index 3e930fb..30d5322 100644 (file)
--- 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)
-) ENGINE=HEAP;
+) TYPE=HEAP;

diff --git a/maintenance/archives/patch-querycache.sql b/maintenance/archives/patch-querycache.sql
index b0a5e3b..7df9129 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-searchindex.sql b/maintenance/archives/patch-searchindex.sql
index 0e7f395..fb54dbb 100644 (file)
--- a/maintenance/archives/patch-searchindex.sql
+++ b/maintenance/archives/patch-searchindex.sql
@@ -19,7 +19,7 @@ CREATE TABLE /*$wgDBprefix*/searchindex (
   
   UNIQUE KEY (si_page)
 
-) ENGINE=MyISAM;
+) TYPE=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 47d6ac9..49bd9c5 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 

diff --git a/maintenance/archives/patch-transcache.sql b/maintenance/archives/patch-transcache.sql
index 94e0a97..a244bff 100644 (file)
--- 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)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 

diff --git a/maintenance/archives/patch-user_groups.sql b/maintenance/archives/patch-user_groups.sql
index af79d46..50f9999 100644 (file)
--- 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)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-user_rights.sql b/maintenance/archives/patch-user_rights.sql
index 640320e..36f0102 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=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 1d61286..ab3a9a7 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-usernewtalk.sql b/maintenance/archives/patch-usernewtalk.sql
index 4307dde..fb8c865 100644 (file)
--- 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)
-) ENGINE=MyISAM;
+) TYPE=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 5d7a16d..3fa7e84 100644 (file)
--- 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`)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/archives/patch-watchlist.sql b/maintenance/archives/patch-watchlist.sql
index f491c53..adee010 100644 (file)
--- 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)
-) ENGINE=MyISAM PACK_KEYS=1;
+) TYPE=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 f61d682..54f6cb3 100644 (file)
--- 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)
-) ENGINE=MyISAM PACK_KEYS=1;";
+) TYPE=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 67e328f..b4605a5 100644 (file)
--- 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)
-) ENGINE=MyISAM PACK_KEYS=1";
+) TYPE=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 0d3f6b7..f094c8b 100644 (file)
--- 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
-) ENGINE=MyISAM;
+) TYPE=MyISAM;
 
 CREATE TABLE recentchanges (
  user_name tinyblob,
  user_lang varchar(5) default NULL,
  date timestamp(14) NOT NULL,
  message tinyblob
-) ENGINE=MyISAM;
+) TYPE=MyISAM;
 
 

diff --git a/maintenance/mysql5/tables.sql b/maintenance/mysql5/tables.sql
index c2b9bc9..fcf41a3 100644 (file)
--- 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)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=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)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=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)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 
 --
@@ -225,7 +225,7 @@ CREATE TABLE /*$wgDBprefix*/page (
   INDEX (page_random),
   INDEX (page_len)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=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)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 
 --
@@ -309,7 +309,7 @@ CREATE TABLE /*$wgDBprefix*/text (
   
   PRIMARY KEY old_id (old_id)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=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)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=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)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=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)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 
 --
@@ -421,7 +421,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks (
   UNIQUE KEY il_from(il_from,il_to),
   KEY (il_to)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=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)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=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))
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 --
 -- Contains a single row with some aggregate info
@@ -525,7 +525,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats (
 
   UNIQUE KEY ss_row_id (ss_row_id)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- Stores an ID for every time any article is visited;
@@ -536,7 +536,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats (
 --
 CREATE TABLE /*$wgDBprefix*/hitcounter (
   hc_id INTEGER UNSIGNED NOT NULL
-) ENGINE=HEAP MAX_ROWS=25000;
+) TYPE=HEAP MAX_ROWS=25000;
 
 
 --
@@ -581,7 +581,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks (
   INDEX ipb_user (ipb_user),
   INDEX ipb_range (ipb_range_start(8), ipb_range_end(8))
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 
 --
@@ -638,7 +638,7 @@ CREATE TABLE /*$wgDBprefix*/image (
   -- Used by Special:Newimages and Special:Imagelist
   INDEX img_timestamp (img_timestamp)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 --
 -- Previous revisions of uploaded files.
@@ -665,7 +665,7 @@ CREATE TABLE /*$wgDBprefix*/oldimage (
 
   INDEX oi_name (oi_name(10))
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 
 --
@@ -730,7 +730,7 @@ CREATE TABLE /*$wgDBprefix*/recentchanges (
   INDEX new_name_timestamp(rc_new,rc_namespace,rc_timestamp),
   INDEX rc_ip (rc_ip)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 CREATE TABLE /*$wgDBprefix*/watchlist (
   -- Key to user.user_id
@@ -749,7 +749,7 @@ CREATE TABLE /*$wgDBprefix*/watchlist (
   UNIQUE KEY (wl_user, wl_namespace, wl_title),
   KEY namespace_title (wl_namespace,wl_title)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 
 --
@@ -775,7 +775,7 @@ CREATE TABLE /*$wgDBprefix*/math (
   
   UNIQUE KEY math_inputhash (math_inputhash)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 --
 -- When using the default MySQL search backend, page titles
@@ -799,7 +799,7 @@ CREATE TABLE /*$wgDBprefix*/searchindex (
   FULLTEXT si_title (si_title),
   FULLTEXT si_text (si_text)
 
-) ENGINE=MyISAM, DEFAULT CHARSET=utf8;
+) TYPE=MyISAM, DEFAULT CHARSET=utf8;
 
 --
 -- Recognized interwiki link prefixes
@@ -822,7 +822,7 @@ CREATE TABLE /*$wgDBprefix*/interwiki (
   
   UNIQUE KEY iw_prefix (iw_prefix)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 --
 -- Used for caching expensive grouped queries
@@ -840,7 +840,7 @@ CREATE TABLE /*$wgDBprefix*/querycache (
   
   KEY (qc_type,qc_value)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 --
 -- For a few generic cache operations if not using Memcached
@@ -852,7 +852,7 @@ CREATE TABLE /*$wgDBprefix*/objectcache (
   unique key (keyname),
   key (exptime)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 --
 -- Cache of interwiki transclusion
@@ -862,7 +862,7 @@ CREATE TABLE /*$wgDBprefix*/transcache (
        tc_contents     TEXT,
        tc_time         INT NOT NULL,
        UNIQUE INDEX tc_url_idx(tc_url)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 -- For article validation
 CREATE TABLE /*$wgDBprefix*/validate (
@@ -874,7 +874,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)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 
 CREATE TABLE /*$wgDBprefix*/logging (
@@ -905,7 +905,7 @@ CREATE TABLE /*$wgDBprefix*/logging (
   KEY user_time (log_user, log_timestamp),
   KEY page_time (log_namespace, log_title, log_timestamp)
 
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 CREATE TABLE /*$wgDBprefix*/trackbacks (
        tb_id integer AUTO_INCREMENT PRIMARY KEY,
@@ -916,7 +916,7 @@ CREATE TABLE /*$wgDBprefix*/trackbacks (
        tb_name varchar(255),
 
        INDEX (tb_page)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
 
 -- Jobs performed by parallel apache threads or a command-line daemon
 CREATE TABLE /*$wgDBprefix*/job (
@@ -936,4 +936,4 @@ CREATE TABLE /*$wgDBprefix*/job (
 
   PRIMARY KEY job_id (job_id),
   KEY (job_cmd, job_namespace, job_title)
-) ENGINE=InnoDB, DEFAULT CHARSET=utf8;
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;

diff --git a/maintenance/storage/blobs.sql b/maintenance/storage/blobs.sql
index c0054eb..5782ac4 100644 (file)
--- 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)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index b14b7b0..b206a8a 100644 (file)
--- 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)
 
-) ENGINE=InnoDB;
+) TYPE=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)
-) ENGINE=InnoDB;
+) TYPE=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)
 
-) ENGINE=InnoDB;
+) TYPE=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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 --
@@ -296,7 +296,7 @@ CREATE TABLE /*$wgDBprefix*/text (
   
   PRIMARY KEY old_id (old_id)
 
-) ENGINE=InnoDB;
+) TYPE=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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 --
@@ -368,7 +368,7 @@ CREATE TABLE /*$wgDBprefix*/pagelinks (
   UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title),
   KEY (pl_namespace,pl_title)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 --
@@ -388,7 +388,7 @@ CREATE TABLE /*$wgDBprefix*/templatelinks (
   UNIQUE KEY tl_from(tl_from,tl_namespace,tl_title),
   KEY (tl_namespace,tl_title)
 
-) ENGINE=InnoDB;
+) TYPE=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)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- Track category inclusions *used inline*
@@ -447,7 +447,7 @@ CREATE TABLE /*$wgDBprefix*/categorylinks (
   -- Not really used?
   KEY cl_timestamp(cl_to,cl_timestamp)
 
-) ENGINE=InnoDB;
+) TYPE=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))
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- Contains a single row with some aggregate info
@@ -512,7 +512,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats (
 
   UNIQUE KEY ss_row_id (ss_row_id)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- Stores an ID for every time any article is visited;
@@ -523,7 +523,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats (
 --
 CREATE TABLE /*$wgDBprefix*/hitcounter (
   hc_id INTEGER UNSIGNED NOT NULL
-) ENGINE=HEAP MAX_ROWS=25000;
+) TYPE=HEAP MAX_ROWS=25000;
 
 
 --
@@ -568,7 +568,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks (
   INDEX ipb_user (ipb_user),
   INDEX ipb_range (ipb_range_start(8), ipb_range_end(8))
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 --
@@ -625,7 +625,7 @@ CREATE TABLE /*$wgDBprefix*/image (
   -- Used by Special:Newimages and Special:Imagelist
   INDEX img_timestamp (img_timestamp)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- Previous revisions of uploaded files.
@@ -652,7 +652,7 @@ CREATE TABLE /*$wgDBprefix*/oldimage (
 
   INDEX oi_name (oi_name(10))
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 --
@@ -717,7 +717,7 @@ CREATE TABLE /*$wgDBprefix*/recentchanges (
   INDEX new_name_timestamp(rc_new,rc_namespace,rc_timestamp),
   INDEX rc_ip (rc_ip)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 CREATE TABLE /*$wgDBprefix*/watchlist (
   -- Key to user.user_id
@@ -736,7 +736,7 @@ CREATE TABLE /*$wgDBprefix*/watchlist (
   UNIQUE KEY (wl_user, wl_namespace, wl_title),
   KEY namespace_title (wl_namespace,wl_title)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 --
@@ -762,7 +762,7 @@ CREATE TABLE /*$wgDBprefix*/math (
   
   UNIQUE KEY math_inputhash (math_inputhash)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- When using the default MySQL search backend, page titles
@@ -786,7 +786,7 @@ CREATE TABLE /*$wgDBprefix*/searchindex (
   FULLTEXT si_title (si_title),
   FULLTEXT si_text (si_text)
 
-) ENGINE=MyISAM;
+) TYPE=MyISAM;
 
 --
 -- Recognized interwiki link prefixes
@@ -809,7 +809,7 @@ CREATE TABLE /*$wgDBprefix*/interwiki (
   
   UNIQUE KEY iw_prefix (iw_prefix)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- Used for caching expensive grouped queries
@@ -827,7 +827,7 @@ CREATE TABLE /*$wgDBprefix*/querycache (
   
   KEY (qc_type,qc_value)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- For a few generic cache operations if not using Memcached
@@ -839,7 +839,7 @@ CREATE TABLE /*$wgDBprefix*/objectcache (
   unique key (keyname),
   key (exptime)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 --
 -- Cache of interwiki transclusion
@@ -849,7 +849,7 @@ CREATE TABLE /*$wgDBprefix*/transcache (
        tc_contents     TEXT,
        tc_time         INT NOT NULL,
        UNIQUE INDEX tc_url_idx(tc_url)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 -- For article validation
 CREATE TABLE /*$wgDBprefix*/validate (
@@ -861,7 +861,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)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 CREATE TABLE /*$wgDBprefix*/logging (
@@ -893,7 +893,7 @@ CREATE TABLE /*$wgDBprefix*/logging (
   KEY page_time (log_namespace, log_title, log_timestamp),
   KEY times (log_timestamp)
 
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 CREATE TABLE /*$wgDBprefix*/trackbacks (
        tb_id integer AUTO_INCREMENT PRIMARY KEY,
@@ -904,7 +904,7 @@ CREATE TABLE /*$wgDBprefix*/trackbacks (
        tb_name varchar(255),
 
        INDEX (tb_page)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;
 
 
 -- Jobs performed by parallel apache threads or a command-line daemon
@@ -925,4 +925,4 @@ CREATE TABLE /*$wgDBprefix*/job (
 
   PRIMARY KEY job_id (job_id),
   KEY (job_cmd, job_namespace, job_title)
-) ENGINE=InnoDB;
+) TYPE=InnoDB;

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 16efd05..61fe17b 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -390,7 +390,7 @@ function do_schema_restructuring() {
                        UNIQUE INDEX name_title (page_namespace,page_title),
                        INDEX (page_random),
                        INDEX (page_len)
-                       ) ENGINE=InnoDB", $fname );
+                       ) TYPE=InnoDB", $fname );
                $wgDatabase->query("CREATE TABLE $revision (
                        rev_id int(8) unsigned NOT NULL auto_increment,
                        rev_page int(8) unsigned NOT NULL,
@@ -407,7 +407,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)
-                       ) ENGINE=InnoDB", $fname );
+                       ) TYPE=InnoDB", $fname );
 
                echo wfTimestamp();
                echo "......Locking tables.\n";