| Index: trunk/phase3/maintenance/archives/rebuildRecentchanges.inc |
| — | — | @@ -32,7 +32,7 @@ |
| 33 | 33 | INDEX rc_timestamp (rc_timestamp), |
| 34 | 34 | INDEX rc_namespace (rc_namespace), |
| 35 | 35 | INDEX rc_title (rc_title) |
| 36 | | -) TYPE=MyISAM PACK_KEYS=1;"; |
| | 36 | +) ENGINE=MyISAM PACK_KEYS=1;"; |
| 37 | 37 | wfQuery( $sql ); |
| 38 | 38 | |
| 39 | 39 | print( "Loading from CUR table...\n" ); |
| Index: trunk/phase3/maintenance/archives/patch-hitcounter.sql |
| — | — | @@ -6,4 +6,4 @@ |
| 7 | 7 | |
| 8 | 8 | CREATE TABLE /*$wgDBprefix*/hitcounter ( |
| 9 | 9 | hc_id INTEGER UNSIGNED NOT NULL |
| 10 | | -) TYPE=HEAP MAX_ROWS=25000; |
| | 10 | +) ENGINE=HEAP MAX_ROWS=25000; |
| Index: trunk/phase3/maintenance/archives/patch-profiling.sql |
| — | — | @@ -8,4 +8,4 @@ |
| 9 | 9 | pf_name varchar(255) NOT NULL default '', |
| 10 | 10 | pf_server varchar(30) NOT NULL default '', |
| 11 | 11 | UNIQUE KEY pf_name_server (pf_name, pf_server) |
| 12 | | -) TYPE=HEAP; |
| | 12 | +) ENGINE=HEAP; |
| Index: trunk/phase3/maintenance/archives/patch-searchindex.sql |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | |
| 21 | 21 | UNIQUE KEY (si_page) |
| 22 | 22 | |
| 23 | | -) TYPE=MyISAM; |
| | 23 | +) ENGINE=MyISAM; |
| 24 | 24 | |
| 25 | 25 | -- Copying data into new table... |
| 26 | 26 | INSERT INTO /*$wgDBprefix*/searchindex |
| Index: trunk/phase3/maintenance/archives/upgradeWatchlist.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | wl_user int(5) unsigned NOT NULL, |
| 32 | 32 | wl_page int(8) unsigned NOT NULL, |
| 33 | 33 | UNIQUE KEY (wl_user, wl_page) |
| 34 | | -) TYPE=MyISAM PACK_KEYS=1"; |
| | 34 | +) ENGINE=MyISAM PACK_KEYS=1"; |
| 35 | 35 | wfQuery( $sql, DB_MASTER ); |
| 36 | 36 | |
| 37 | 37 | $lc = new LinkCache; |
| Index: trunk/phase3/maintenance/storage/blobs.sql |
| — | — | @@ -4,5 +4,5 @@ |
| 5 | 5 | blob_id integer UNSIGNED NOT NULL AUTO_INCREMENT, |
| 6 | 6 | blob_text longblob, |
| 7 | 7 | PRIMARY KEY (blob_id) |
| 8 | | -) TYPE=MyISAM MAX_ROWS=1000000 AVG_ROW_LENGTH=1000000; |
| | 8 | +) ENGINE=MyISAM MAX_ROWS=1000000 AVG_ROW_LENGTH=1000000; |
| 9 | 9 | |
| Index: trunk/phase3/maintenance/updaters.inc |
| — | — | @@ -555,7 +555,7 @@ |
| 556 | 556 | UNIQUE INDEX name_title (page_namespace,page_title), |
| 557 | 557 | INDEX (page_random), |
| 558 | 558 | INDEX (page_len) |
| 559 | | - ) TYPE=InnoDB", $fname ); |
| | 559 | + ) ENGINE=InnoDB", $fname ); |
| 560 | 560 | $wgDatabase->query("CREATE TABLE $revision ( |
| 561 | 561 | rev_id int(8) unsigned NOT NULL auto_increment, |
| 562 | 562 | rev_page int(8) unsigned NOT NULL, |
| — | — | @@ -573,7 +573,7 @@ |
| 574 | 574 | INDEX page_timestamp (rev_page,rev_timestamp), |
| 575 | 575 | INDEX user_timestamp (rev_user,rev_timestamp), |
| 576 | 576 | INDEX usertext_timestamp (rev_user_text,rev_timestamp) |
| 577 | | - ) TYPE=InnoDB", $fname ); |
| | 577 | + ) ENGINE=InnoDB", $fname ); |
| 578 | 578 | |
| 579 | 579 | echo wfTimestamp( TS_DB ); |
| 580 | 580 | echo "......Locking tables.\n"; |
| Index: trunk/phase3/maintenance/tables.sql |
| — | — | @@ -616,7 +616,7 @@ |
| 617 | 617 | -- |
| 618 | 618 | CREATE TABLE /*$wgDBprefix*/hitcounter ( |
| 619 | 619 | hc_id int unsigned NOT NULL |
| 620 | | -) TYPE=HEAP MAX_ROWS=25000; |
| | 620 | +) ENGINE=HEAP MAX_ROWS=25000; |
| 621 | 621 | |
| 622 | 622 | |
| 623 | 623 | -- |
| — | — | @@ -994,7 +994,7 @@ |
| 995 | 995 | FULLTEXT si_title (si_title), |
| 996 | 996 | FULLTEXT si_text (si_text) |
| 997 | 997 | |
| 998 | | -) TYPE=MyISAM; |
| | 998 | +) ENGINE=MyISAM; |
| 999 | 999 | |
| 1000 | 1000 | -- |
| 1001 | 1001 | -- Recognized interwiki link prefixes |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -554,7 +554,7 @@ |
| 555 | 555 | /** Table name prefix */ |
| 556 | 556 | $wgDBprefix = ''; |
| 557 | 557 | /** MySQL table options to use during installation or update */ |
| 558 | | -$wgDBTableOptions = 'TYPE=InnoDB'; |
| | 558 | +$wgDBTableOptions = 'ENGINE=InnoDB'; |
| 559 | 559 | |
| 560 | 560 | /** To override default SQLite data directory ($docroot/../data) */ |
| 561 | 561 | $wgSQLiteDataDir = ''; |