[geeklog-cvs] geeklog: "ENGINE is the preferred term, but cannot be used befor...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Fri Jan 1 15:56:36 EST 2010
changeset 7568:07c5fd64f7ea
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/07c5fd64f7ea
user: Dirk Haun <dirk at haun-online.de>
date: Fri Jan 01 15:39:03 2010 +0100
description:
"ENGINE is the preferred term, but cannot be used before MySQL 4.0.18." Oh well ...
diffstat:
plugins/calendar/sql/mysql_install.php | 8 +-
plugins/links/sql/mysql_install.php | 10 +-
plugins/polls/sql/mysql_install.php | 10 +-
plugins/spamx/sql/mysql_install.php | 4 +-
plugins/staticpages/sql/mysql_install.php | 4 +-
public_html/admin/install/lib-install.php | 2 +-
sql/mysql_tableanddata.php | 76 ++++++++++++------------
7 files changed, 57 insertions(+), 57 deletions(-)
diffs (truncated from 534 to 300 lines):
diff -r 8a7c59dcccda -r 07c5fd64f7ea plugins/calendar/sql/mysql_install.php
--- a/plugins/calendar/sql/mysql_install.php Fri Jan 01 15:25:20 2010 +0100
+++ b/plugins/calendar/sql/mysql_install.php Fri Jan 01 15:39:03 2010 +0100
@@ -6,7 +6,7 @@
// +---------------------------------------------------------------------------+
// | mysql_install.php |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2009 by the following authors: |
+// | Copyright (C) 2000-2010 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -61,7 +61,7 @@
INDEX events_datestart(datestart),
INDEX events_dateend(dateend),
PRIMARY KEY (eid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -84,7 +84,7 @@
timeend time default NULL,
owner_id mediumint(8) unsigned NOT NULL default '1',
PRIMARY KEY (eid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -114,7 +114,7 @@
timestart time default NULL,
timeend time default NULL,
PRIMARY KEY (eid,uid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend, owner_id) VALUES ('2008050110130162','Installed the Calendar plugin','Today, you successfully installed the Calendar plugin.','Your webserver',CURDATE(),CURDATE(),'http://www.geeklog.net/',1,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,1)";
diff -r 8a7c59dcccda -r 07c5fd64f7ea plugins/links/sql/mysql_install.php
--- a/plugins/links/sql/mysql_install.php Fri Jan 01 15:25:20 2010 +0100
+++ b/plugins/links/sql/mysql_install.php Fri Jan 01 15:39:03 2010 +0100
@@ -6,7 +6,7 @@
// +---------------------------------------------------------------------------+
// | Installation SQL |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2008 by the following authors: |
+// | Copyright (C) 2000-2010 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -37,7 +37,7 @@
* @filesource
* @version 2.0
* @since GL 1.4.0
- * @copyright Copyright © 2005-2008
+ * @copyright Copyright © 2005-2010
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
* @author Trinity Bays <trinity93 at gmail.com>
* @author Tony Bibbs <tony at tonybibbs.com>
@@ -65,7 +65,7 @@
perm_anon tinyint(1) unsigned NOT NULL default '2',
PRIMARY KEY (cid),
KEY links_pid (pid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -86,7 +86,7 @@
INDEX links_category(cid),
INDEX links_date(date),
PRIMARY KEY (lid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -100,7 +100,7 @@
date datetime default NULL,
owner_id mediumint(8) unsigned NOT NULL default '1',
PRIMARY KEY (lid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
?>
diff -r 8a7c59dcccda -r 07c5fd64f7ea plugins/polls/sql/mysql_install.php
--- a/plugins/polls/sql/mysql_install.php Fri Jan 01 15:25:20 2010 +0100
+++ b/plugins/polls/sql/mysql_install.php Fri Jan 01 15:39:03 2010 +0100
@@ -6,7 +6,7 @@
// +---------------------------------------------------------------------------+
// | mysql_install.php |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2009 by the following authors: |
+// | Copyright (C) 2000-2010 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Mark Limburg - mlimburg AT users DOT sourceforge DOT net |
@@ -45,7 +45,7 @@
votes mediumint(8) unsigned default NULL,
remark varchar(255) NULL,
PRIMARY KEY (pid, qid, aid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -54,7 +54,7 @@
pid varchar(40) NOT NULL default '',
question varchar(255) NOT NULL,
PRIMARY KEY (qid, pid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -83,7 +83,7 @@
INDEX pollquestions_commentcode(commentcode),
INDEX pollquestions_statuscode(statuscode),
PRIMARY KEY (pid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -93,7 +93,7 @@
ipaddress varchar(39) NOT NULL default '',
date int(10) unsigned default NULL,
PRIMARY KEY (id)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',100,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
diff -r 8a7c59dcccda -r 07c5fd64f7ea plugins/spamx/sql/mysql_install.php
--- a/plugins/spamx/sql/mysql_install.php Fri Jan 01 15:25:20 2010 +0100
+++ b/plugins/spamx/sql/mysql_install.php Fri Jan 01 15:39:03 2010 +0100
@@ -6,7 +6,7 @@
// +---------------------------------------------------------------------------+
// | Installation SQL |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2004-2009 by the following authors: |
+// | Copyright (C) 2004-2010 by the following authors: |
// | |
// | Authors: Tom Willett - tomw AT pigstye DOT net |
// +---------------------------------------------------------------------------+
@@ -35,7 +35,7 @@
name varchar(20) NOT NULL default '',
value varchar(255) NOT NULL default '',
INDEX spamx_name(name)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$DEFVALUES[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('spamx.counter', '0')";
diff -r 8a7c59dcccda -r 07c5fd64f7ea plugins/staticpages/sql/mysql_install.php
--- a/plugins/staticpages/sql/mysql_install.php Fri Jan 01 15:25:20 2010 +0100
+++ b/plugins/staticpages/sql/mysql_install.php Fri Jan 01 15:39:03 2010 +0100
@@ -6,7 +6,7 @@
// +---------------------------------------------------------------------------+
// | Installation SQL |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2009 by the following authors: |
+// | Copyright (C) 2000-2010 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
// | Tom Willett - twillett AT users DOT sourceforge DOT net |
@@ -69,7 +69,7 @@
KEY staticpage_sp_centerblock (sp_centerblock),
KEY staticpage_sp_tid (sp_tid),
KEY staticpage_sp_where (sp_where)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
?>
diff -r 8a7c59dcccda -r 07c5fd64f7ea public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php Fri Jan 01 15:25:20 2010 +0100
+++ b/public_html/admin/install/lib-install.php Fri Jan 01 15:39:03 2010 +0100
@@ -65,7 +65,7 @@
define('SUPPORTED_PHP_VER', '4.3.0');
}
if (!defined('SUPPORTED_MYSQL_VER')) {
- define('SUPPORTED_MYSQL_VER', '4.0.0');
+ define('SUPPORTED_MYSQL_VER', '4.0.18');
}
$_REQUEST = array_merge($_GET, $_POST);
diff -r 8a7c59dcccda -r 07c5fd64f7ea sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php Fri Jan 01 15:25:20 2010 +0100
+++ b/sql/mysql_tableanddata.php Fri Jan 01 15:39:03 2010 +0100
@@ -5,7 +5,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[] = "
@@ -14,7 +14,7 @@
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
";
$_SQL[] = "
@@ -49,7 +49,7 @@
INDEX blocks_name(name),
INDEX blocks_onleft(onleft),
PRIMARY KEY (bid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -57,7 +57,7 @@
code tinyint(4) NOT NULL default '0',
name varchar(32) default NULL,
PRIMARY KEY (code)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -66,7 +66,7 @@
uid mediumint(8) NOT NULL,
time datetime NOT NULL,
PRIMARY KEY (cid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -74,7 +74,7 @@
mode varchar(10) NOT NULL default '',
name varchar(32) default NULL,
PRIMARY KEY (mode)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -84,7 +84,7 @@
deletehash varchar(32) NOT NULL,
mid int(10) default NULL,
PRIMARY KEY (deletehash)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -110,7 +110,7 @@
INDEX comments_rht(rht),
INDEX comments_date(date),
PRIMARY KEY (cid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -126,7 +126,7 @@
pid int(10) NOT NULL default '0',
ipaddress varchar(39) NOT NULL,
PRIMARY KEY (cid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -140,7 +140,7 @@
selectionArray int(11) default NULL,
sort_order int(11) default NULL,
fieldset int(11) default NULL
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
@@ -148,7 +148,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[] = "
@@ -157,7 +157,7 @@
format varchar(32) default NULL,
description varchar(64) default NULL,
PRIMARY KEY (dfid)
-) TYPE=MyISAM
+) ENGINE=MyISAM
";
$_SQL[] = "
More information about the geeklog-cvs
mailing list