[geeklog-hg] geeklog: Changed MySQL "TYPE=MyIsam" option to "ENGINE=MyIsam" (...

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Tue Jun 26 14:06:45 EDT 2012


changeset 8727:cc56ef2be024
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/cc56ef2be024
user: Tom <websitemaster at cogeco.net>
date: Tue Jun 26 13:59:17 2012 -0400
description:
Changed MySQL "TYPE=MyIsam" option to "ENGINE=MyIsam" (bug #0001403)

diffstat:

 plugins/links/sql/mysql_updates.php   |   2 +-
 plugins/polls/sql/mysql_updates.php   |   2 +-
 sql/updates/1.2.5-1_to_1.3.sql        |  14 +++++++-------
 sql/updates/mysql_1.2.5-1_to_1.3.php  |  14 +++++++-------
 sql/updates/mysql_1.3.11_to_1.4.0.php |   6 +++---
 sql/updates/mysql_1.3.4_to_1.3.5.php  |   2 +-
 sql/updates/mysql_1.3.8_to_1.3.9.php  |   2 +-
 sql/updates/mysql_1.3.9_to_1.3.10.php |   2 +-
 sql/updates/mysql_1.4.1_to_1.5.0.php  |   4 ++--
 sql/updates/mysql_1.5.2_to_1.6.0.php  |   6 +++---
 10 files changed, 27 insertions(+), 27 deletions(-)

diffs (268 lines):

diff -r bcd6f2064a33 -r cc56ef2be024 plugins/links/sql/mysql_updates.php
--- a/plugins/links/sql/mysql_updates.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/plugins/links/sql/mysql_updates.php	Tue Jun 26 13:59:17 2012 -0400
@@ -56,7 +56,7 @@
           perm_anon tinyint(1) unsigned NOT NULL default '2',
           PRIMARY KEY (cid),
           KEY links_pid (pid)
-        ) TYPE=MyISAM",
+        ) ENGINE=MyISAM",
         "ALTER TABLE {$_TABLES['linksubmission']} ADD owner_id mediumint(8) unsigned NOT NULL default '1' AFTER date",
         "ALTER TABLE {$_TABLES['linksubmission']} CHANGE category cid varchar(32) NOT NULL",
         "ALTER TABLE {$_TABLES['links']} CHANGE category cid varchar(32) NOT NULL"
diff -r bcd6f2064a33 -r cc56ef2be024 plugins/polls/sql/mysql_updates.php
--- a/plugins/polls/sql/mysql_updates.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/plugins/polls/sql/mysql_updates.php	Tue Jun 26 13:59:17 2012 -0400
@@ -51,7 +51,7 @@
           pid varchar(20) NOT NULL,
           question varchar(255) NOT NULL,
           PRIMARY KEY (qid, pid)
-        ) TYPE=MyISAM",
+        ) ENGINE=MyISAM",
         // in 1.4.1, "don't display poll" was equivalent to "closed"
         "UPDATE {$_TABLES['polltopics']} SET is_open = 0 WHERE display = 0"
     ),
diff -r bcd6f2064a33 -r cc56ef2be024 sql/updates/1.2.5-1_to_1.3.sql
--- a/sql/updates/1.2.5-1_to_1.3.sql	Wed Jun 20 10:18:13 2012 -0400
+++ b/sql/updates/1.2.5-1_to_1.3.sql	Tue Jun 26 13:59:17 2012 -0400
@@ -2,7 +2,7 @@
   acc_ft_id mediumint(8) NOT NULL default '0',
   acc_grp_id mediumint(8) NOT NULL default '0',
   PRIMARY KEY  (acc_ft_id,acc_grp_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 ALTER TABLE blocks ADD name varchar(48) NOT NULL default '';
 ALTER TABLE blocks DROP seclev;
@@ -19,7 +19,7 @@
   cc_value int(8) unsigned NOT NULL default '0',
   cc_descr varchar(20) NOT NULL default '',
   PRIMARY KEY  (cc_value)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 ALTER TABLE events MODIFY location varchar(128) default NULL;
 ALTER TABLE events ADD event_type varchar(40) NOT NULL default '';
@@ -55,14 +55,14 @@
   ft_gl_core tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (ft_id),
   KEY ft_name (ft_name)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
                         
 CREATE TABLE group_assignments (
   ug_main_grp_id mediumint(8) NOT NULL default '0',
   ug_uid mediumint(8) unsigned default NULL,
   ug_grp_id mediumint(8) unsigned default NULL,
   KEY ug_main_grp_id (ug_main_grp_id)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 CREATE TABLE groups (
   grp_id mediumint(8) NOT NULL auto_increment,
@@ -71,7 +71,7 @@
   grp_gl_core tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (grp_id),
   KEY grp_name (grp_name)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 ALTER TABLE links ADD group_id mediumint(8) unsigned NOT NULL default '1';
 ALTER TABLE links ADD owner_id mediumint(8) unsigned NOT NULL default '0';
@@ -105,7 +105,7 @@
   perm_members tinyint(1) unsigned NOT NULL default '2',
   perm_anon tinyint(1) unsigned NOT NULL default '2',
   PRIMARY KEY  (eid)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 CREATE TABLE plugins (
   pi_name varchar(30) NOT NULL default '',
@@ -114,7 +114,7 @@
   pi_enabled tinyint(3) unsigned NOT NULL default '1',
   pi_homepage varchar(128) NOT NULL default '',
   PRIMARY KEY  (pi_name)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
                                                                                                         
 ALTER TABLE stories ADD numemails mediumint(8) unsigned NOT NULL default '0';
 ALTER TABLE stories ADD owner_id mediumint(8) NOT NULL default '0';
diff -r bcd6f2064a33 -r cc56ef2be024 sql/updates/mysql_1.2.5-1_to_1.3.php
--- a/sql/updates/mysql_1.2.5-1_to_1.3.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/sql/updates/mysql_1.2.5-1_to_1.3.php	Tue Jun 26 13:59:17 2012 -0400
@@ -4,7 +4,7 @@
   acc_ft_id mediumint(8) NOT NULL default '0',
   acc_grp_id mediumint(8) NOT NULL default '0',
   PRIMARY KEY  (acc_ft_id,acc_grp_id)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[b] = "ALTER TABLE {$_TABLES['blocks']} ADD name varchar(48) NOT NULL default ''";
 $_SQL[c] = "ALTER TABLE {$_TABLES['blocks']} DROP seclev";
@@ -21,7 +21,7 @@
   cc_value int(8) unsigned NOT NULL default '0',
   cc_descr varchar(20) NOT NULL default '',
   PRIMARY KEY  (cc_value)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[m] = "ALTER TABLE {$_TABLES['events']} MODIFY location varchar(128) default NULL";
 $_SQL[n] = "ALTER TABLE {$_TABLES['events']} ADD event_type varchar(40) NOT NULL default ''";
@@ -58,14 +58,14 @@
   ft_gl_core tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (ft_id),
   KEY ft_name (ft_name)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[n1] = "CREATE TABLE {$_TABLES['group_assignments']} (
   ug_main_grp_id mediumint(8) NOT NULL default '0',
   ug_uid mediumint(8) unsigned default NULL,
   ug_grp_id mediumint(8) unsigned default NULL,
   KEY ug_main_grp_id (ug_main_grp_id)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[o1] = "CREATE TABLE {$_TABLES['groups']} (
   grp_id mediumint(8) NOT NULL auto_increment,
@@ -74,7 +74,7 @@
   grp_gl_core tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (grp_id),
   KEY grp_name (grp_name)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[p1] = "ALTER TABLE {$_TABLES['links']} ADD group_id mediumint(8) unsigned NOT NULL default '1'";
 $_SQL[q1] = "ALTER TABLE {$_TABLES['links']} ADD owner_id mediumint(8) unsigned NOT NULL default '0'";
@@ -108,7 +108,7 @@
   perm_members tinyint(1) unsigned NOT NULL default '2',
   perm_anon tinyint(1) unsigned NOT NULL default '2',
   PRIMARY KEY  (eid)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[w1] = "CREATE TABLE {$_TABLES['plugins']} (
   pi_name varchar(30) NOT NULL default '',
@@ -117,7 +117,7 @@
   pi_enabled tinyint(3) unsigned NOT NULL default '1',
   pi_homepage varchar(128) NOT NULL default '',
   PRIMARY KEY  (pi_name)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[x1] = "ALTER TABLE {$_TABLES['stories']} ADD numemails mediumint(8) unsigned NOT NULL default '0'";
 $_SQL[y1] = "ALTER TABLE {$_TABLES['stories']} ADD owner_id mediumint(8) NOT NULL default '0'";
diff -r bcd6f2064a33 -r cc56ef2be024 sql/updates/mysql_1.3.11_to_1.4.0.php
--- a/sql/updates/mysql_1.3.11_to_1.4.0.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/sql/updates/mysql_1.3.11_to_1.4.0.php	Tue Jun 26 13:59:17 2012 -0400
@@ -15,7 +15,7 @@
   INDEX trackback_url(url), 
   INDEX trackback_date(date), 
   INDEX trackback_type(type)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[] = "CREATE TABLE {$_TABLES['pingservice']} (
   pid smallint(5) unsigned NOT NULL auto_increment,
@@ -26,13 +26,13 @@
   is_enabled tinyint(1) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (pid),
   INDEX pingservice_is_enabled(is_enabled)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 $_SQL[] = "CREATE TABLE {$_TABLES['trackbackcodes']} (
   code tinyint(4) NOT NULL default '0',
   name varchar(32) default NULL,
   PRIMARY KEY  (code)
-) TYPE=MyISAM ";
+) ENGINE=MyISAM ";
 
 // a weblog directory to ping (which, in turn, pings others)
 $_SQL[] = "INSERT INTO {$_TABLES['pingservice']} (pid, name, site_url, ping_url, method, is_enabled) VALUES (1, 'Ping-O-Matic', 'http://pingomatic.com/', 'http://rpc.pingomatic.com/', 'weblogUpdates.ping', 1)";
diff -r bcd6f2064a33 -r cc56ef2be024 sql/updates/mysql_1.3.4_to_1.3.5.php
--- a/sql/updates/mysql_1.3.4_to_1.3.5.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/sql/updates/mysql_1.3.4_to_1.3.5.php	Tue Jun 26 13:59:17 2012 -0400
@@ -12,6 +12,6 @@
   ai_img_num tinyint(2) unsigned NOT NULL,
   ai_filename varchar(128) NOT NULL,
   PRIMARY KEY (ai_sid,ai_img_num)
-) TYPE=MyISAM
+) ENGINE=MyISAM
 ";
 ?>
diff -r bcd6f2064a33 -r cc56ef2be024 sql/updates/mysql_1.3.8_to_1.3.9.php
--- a/sql/updates/mysql_1.3.8_to_1.3.9.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/sql/updates/mysql_1.3.8_to_1.3.9.php	Tue Jun 26 13:59:17 2012 -0400
@@ -19,7 +19,7 @@
   INDEX syndication_type(type),
   INDEX syndication_is_enabled(is_enabled),
   INDEX syndication_updated(updated)
-) TYPE=MyISAM";
+) ENGINE=MyISAM";
 
 // remove unused entry (moved to 'syndication' table)
 $_SQL[] = "DELETE FROM {$_TABLES['vars']} WHERE name = 'rdf_sids'";
diff -r bcd6f2064a33 -r cc56ef2be024 sql/updates/mysql_1.3.9_to_1.3.10.php
--- a/sql/updates/mysql_1.3.9_to_1.3.10.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/sql/updates/mysql_1.3.9_to_1.3.10.php	Tue Jun 26 13:59:17 2012 -0400
@@ -178,7 +178,7 @@
                 . " name varchar(20) NOT NULL default '',"
                 . " value varchar(255) NOT NULL default '',"
                 . " INDEX spamx_name (name)"
-                . ") TYPE=MyISAM";
+                . ") ENGINE=MyISAM";
 
     // SpamX plugin information, 'spamx.admin' feature, SpamX Admin group
     $_SPX_PLUGIN = "INSERT INTO {$_TABLES['plugins']} (pi_name, pi_version, pi_gl_version, pi_enabled, pi_homepage) VALUES ('spamx', '1.0.1','1.3.10',1,'http://www.pigstye.net/gplugs/staticpages/index.php/spamx') ";
diff -r bcd6f2064a33 -r cc56ef2be024 sql/updates/mysql_1.4.1_to_1.5.0.php
--- a/sql/updates/mysql_1.4.1_to_1.5.0.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/sql/updates/mysql_1.4.1_to_1.5.0.php	Tue Jun 26 13:59:17 2012 -0400
@@ -35,7 +35,7 @@
     urlfor varchar(255) NOT NULL,
     ttl mediumint(8) unsigned NOT NULL default '1',
     PRIMARY KEY (token)
-) TYPE=MyISAM
+) ENGINE=MyISAM
 ";
 
 
@@ -54,7 +54,7 @@
       selectionArray int(11) default NULL,
       sort_order int(11) default NULL,
       fieldset int(11) default NULL
-    ) TYPE=MyISAM");
+    ) ENGINE=MyISAM");
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
diff -r bcd6f2064a33 -r cc56ef2be024 sql/updates/mysql_1.5.2_to_1.6.0.php
--- a/sql/updates/mysql_1.5.2_to_1.6.0.php	Wed Jun 20 10:18:13 2012 -0400
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php	Tue Jun 26 13:59:17 2012 -0400
@@ -19,7 +19,7 @@
   uid mediumint(8) NOT NULL,
   time datetime NOT NULL,
   PRIMARY KEY (cid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
 ";
 $_SQL[] = "
 CREATE TABLE {$_TABLES['commentnotifications']} (
@@ -28,7 +28,7 @@
   deletehash varchar(32) NOT NULL,
   mid int(10) default NULL,
   PRIMARY KEY  (deletehash)
-) TYPE=MyISAM 
+) ENGINE=MyISAM 
 ";
 $_SQL[] = "
 CREATE TABLE {$_TABLES['commentsubmissions']} (
@@ -43,7 +43,7 @@
   pid int(10) NOT NULL default '0',
   ipaddress varchar(15) NOT NULL,
   PRIMARY KEY  (cid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
 ";
 $_SQL[] = "ALTER TABLE {$_TABLES['stories']} ADD comment_expire datetime NOT NULL default '0000-00-00 00:00:00' AFTER comments";
 $_SQL[] = "ALTER TABLE {$_TABLES['comments']} ADD name varchar(32) default NULL AFTER indent";



More information about the geeklog-cvs mailing list