[dw-free] TYPE=xxxx is deprecated for ENGINE=xxxx

[commit: http://hg.dwscoalition.org/dw-free/rev/05abe8ffa336]

TYPE=xxxx is deprecated for ENGINE=xxxx

Patch by

mark.

Files modified:

bin/upgrading/update-db-general.pl
bin/upgrading/update-db.pl

--------------------------------------------------------------------------------
diff -r 39317850a5a5 -r 05abe8ffa336 bin/upgrading/update-db-general.pl
--- a/bin/upgrading/update-db-general.pl	Mon Jan 02 22:05:38 2012 +0000
+++ b/bin/upgrading/update-db-general.pl	Wed Jan 04 00:01:37 2012 +0000
@@ -1106,7 +1106,7 @@
     s2lid INT UNSIGNED NOT NULL,
     PRIMARY KEY (s2lid),
     s2code MEDIUMBLOB
-) TYPE=InnoDB
+) ENGINE=InnoDB
 EOC
 
 register_tablecreate("s2checker", <<'EOC'); # global
@@ -1197,7 +1197,7 @@
     INDEX   (updated),
     visible TINYINT NOT NULL DEFAULT 0, -- also boolean
     notes   MEDIUMTEXT
-) TYPE=MYISAM
+) ENGINE=MYISAM
 EOC
 
 register_tablecreate("ml_langs", <<'EOC');
@@ -1252,7 +1252,7 @@
     INDEX (lnid, dmid, itid),
     text    TEXT NOT NULL,
     userid  INT UNSIGNED NOT NULL
-) TYPE=MYISAM
+) ENGINE=MYISAM
 EOC
 
 register_tablecreate("domains", <<'EOC');
@@ -1929,7 +1929,7 @@
 register_tablecreate("recentactions", <<'EOC');
 CREATE TABLE recentactions (
     what CHAR(2) NOT NULL
-) TYPE=MYISAM
+) ENGINE=MYISAM
 EOC
 
 # external identities
@@ -2654,7 +2654,7 @@
     content text,
 
     PRIMARY KEY  (userid,moduleid)
-) TYPE=InnoDB
+) ENGINE=InnoDB
 EOC
 
 register_tablecreate("dw_paidstatus", <<'EOC');
@@ -3774,7 +3774,7 @@
                   q{ALTER TABLE syndicated_hubbub2 ADD COLUMN timespinged INT UNSIGNED NOT NULL DEFAULT '0'} );
     }
 
-    if ( table_relevant( "logkwsum" ) && ! check_dbnote( "logkwsum_fix_filtered_counts_2010" ) ) {
+    if ( 0 && table_relevant( "logkwsum" ) && ! check_dbnote( "logkwsum_fix_filtered_counts_2010" ) ) {
         # this is a very, very racy situation ... we want to do an update of this data, but if anybody
         # else is actively using this table, they're going to be inserting bad data on top of us which
         # will leave SOMEONE in an inconsistent state.  let's warn the user that they should have the site
diff -r 39317850a5a5 -r 05abe8ffa336 bin/upgrading/update-db.pl
--- a/bin/upgrading/update-db.pl	Mon Jan 02 22:05:38 2012 +0000
+++ b/bin/upgrading/update-db.pl	Wed Jan 04 00:01:37 2012 +0000
@@ -786,7 +786,7 @@
 
     my $create_sql = $table_create{$table};
     if ($opt_innodb && $create_sql !~ /type=myisam/i) {
-        $create_sql .= " TYPE=INNODB";
+        $create_sql .= " ENGINE=INNODB";
     }
     do_sql($create_sql);
 
--------------------------------------------------------------------------------

[dw-free] TYPE=xxxx is deprecated for ENGINE=xxxx

no subject