Browse code

Fix MySQL table creation, TYPE to ENGINE

Rainer Volkrodt authored on 2016/03/21 11:50:45
Showing 10 changed files
... ...
@@ -31,5 +31,5 @@ dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX."fanfiction_online` (
31 31
   `online_uid` int(11) NOT NULL default '0',
32 32
   `online_ip` int(11) NOT NULL default '0',
33 33
   `online_timestamp` int(11) NOT NULL default '0'
34
-) TYPE=MyISAM;");
34
+) ENGINE=MyISAM;");
35 35
 ?>
36 36
\ No newline at end of file
... ...
@@ -34,7 +34,7 @@ dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX."fanfiction_poll_votes` (
34 34
   `vote_poll` int(11) NOT NULL default '0',
35 35
   PRIMARY KEY  (`vote_id`),
36 36
   KEY `vote_user` (`vote_user`,`vote_poll`)
37
-) TYPE=MyISAM;") ;
37
+) ENGINE=MyISAM;") ;
38 38
 dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX."fanfiction_poll` (
39 39
 `poll_id` INT NOT NULL AUTO_INCREMENT ,
40 40
 `poll_question` VARCHAR( 250 ) NOT NULL ,
... ...
@@ -31,5 +31,5 @@ dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX."fanfiction_online` (
31 31
   `online_uid` int(11) NOT NULL default '0',
32 32
   `online_ip` int(11) NOT NULL default '0',
33 33
   `online_timestamp` int(11) NOT NULL default '0'
34
-) TYPE=MyISAM;");
34
+) ENGINE=MyISAM;");
35 35
 ?>
36 36
\ No newline at end of file
... ...
@@ -31,5 +31,5 @@ dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX."fanfiction_online` (
31 31
   `online_uid` int(11) NOT NULL default '0',
32 32
   `online_ip` int(11) NOT NULL default '0',
33 33
   `online_timestamp` int(11) NOT NULL default '0'
34
-) TYPE=MyISAM;");
34
+) ENGINE=MyISAM;");
35 35
 ?>
36 36
\ No newline at end of file
... ...
@@ -8,13 +8,13 @@ CREATE TABLE `fanfiction_authorfields` (
8 8
   `field_code_out` text,
9 9
   `field_on` tinyint(1) NOT NULL default '0',
10 10
   PRIMARY KEY  (`field_id`)
11
-) TYPE=MyISAM;
11
+) ENGINE=MyISAM;
12 12
 CREATE TABLE `fanfiction_authorinfo` (
13 13
   `uid` int(11) NOT NULL default '0',
14 14
   `field` int(11) NOT NULL default '0',
15 15
   `info` varchar(255) NOT NULL default ' ',
16 16
   KEY `uid` (`uid`)
17
-) TYPE=MyISAM;
17
+) ENGINE=MyISAM;
18 18
 CREATE TABLE `fanfiction_authorprefs` (
19 19
   `uid` int(11) NOT NULL default '0',
20 20
   `newreviews` tinyint(1) NOT NULL default '0',
... ...
@@ -30,7 +30,7 @@ CREATE TABLE `fanfiction_authorprefs` (
30 30
   `categories` varchar(200) NOT NULL default '0',
31 31
   `contact` tinyint(1) NOT NULL default '0',
32 32
    PRIMARY KEY  (`uid`)
33
-) TYPE=MyISAM;
33
+) ENGINE=MyISAM;
34 34
 CREATE TABLE `fanfiction_blocks` (
35 35
   `block_id` int(11) NOT NULL auto_increment,
36 36
   `block_name` varchar(30) NOT NULL default '',
... ...
@@ -40,7 +40,7 @@ CREATE TABLE `fanfiction_blocks` (
40 40
   `block_variables` text NOT NULL,
41 41
   PRIMARY KEY  (`block_id`),
42 42
   KEY `block_name` (`block_name`)
43
-) TYPE=MyISAM;
43
+) ENGINE=MyISAM;
44 44
 CREATE TABLE `fanfiction_chapters` (
45 45
   `chapid` int(11) NOT NULL auto_increment,
46 46
   `title` varchar(250) NOT NULL default '',
... ...
@@ -61,34 +61,34 @@ CREATE TABLE `fanfiction_chapters` (
61 61
   KEY `inorder` (`inorder`),
62 62
   KEY `title` (`title`),
63 63
   KEY `validated` (`validated`)
64
-) TYPE=MyISAM;
64
+) ENGINE=MyISAM;
65 65
 CREATE TABLE `fanfiction_classes` (
66 66
   `class_id` int(11) NOT NULL auto_increment,
67 67
   `class_type` int(11) NOT NULL default '0',
68 68
   `class_name` varchar(100) NOT NULL default '',
69 69
   PRIMARY KEY  (`class_id`)
70
-) TYPE=MyISAM;
70
+) ENGINE=MyISAM;
71 71
 CREATE TABLE `fanfiction_classtypes` (
72 72
   `classtype_id` int(11) NOT NULL auto_increment,
73 73
   `classtype_name` varchar(50) NOT NULL default '',
74 74
   `classtype_title` varchar(50) NOT NULL default '',
75 75
   PRIMARY KEY  (`classtype_id`),
76 76
   KEY `classtype_title` (`classtype_title`)
77
-) TYPE=MyISAM;
77
+) ENGINE=MyISAM;
78 78
 CREATE TABLE `fanfiction_codeblocks` (
79 79
   `code_id` int(11) NOT NULL auto_increment,
80 80
   `code_text` text NOT NULL,
81 81
   `code_type` varchar(20) default NULL,
82 82
   `code_module` varchar(60) default NULL,
83 83
   PRIMARY KEY  (`code_id`)
84
-) TYPE=MyISAM;
84
+) ENGINE=MyISAM;
85 85
 CREATE TABLE `fanfiction_favorites` (
86 86
   `uid` int(11) NOT NULL default '0',
87 87
   `item` int(11) NOT NULL default '0',
88 88
   `type` char(2) NOT NULL default '',
89 89
   `comments` text NULL,
90 90
   KEY `uid` (`uid`)
91
-) TYPE=MyISAM;
91
+) ENGINE=MyISAM;
92 92
 CREATE TABLE `fanfiction_inseries` (
93 93
   `seriesid` int(11) NOT NULL default '0',
94 94
   `sid` int(11) NOT NULL default '0',
... ...
@@ -99,7 +99,7 @@ CREATE TABLE `fanfiction_inseries` (
99 99
   KEY `sid` (`sid`),
100 100
   KEY `inorder` (`inorder`),
101 101
   KEY `seriesid` (`seriesid`)
102
-) TYPE=MyISAM;
102
+) ENGINE=MyISAM;
103 103
 CREATE TABLE `fanfiction_log` (
104 104
   `log_id` int(11) NOT NULL auto_increment,
105 105
   `log_action` varchar(255) default NULL,
... ...
@@ -108,21 +108,21 @@ CREATE TABLE `fanfiction_log` (
108 108
   `log_timestamp` timestamp NOT NULL,
109 109
   `log_type` varchar(2) NOT NULL,
110 110
   PRIMARY KEY  (`log_id`)
111
-) TYPE=MyISAM
111
+) ENGINE=MyISAM
112 112
 CREATE TABLE `fanfiction_messages` (
113 113
   `message_id` int(11) NOT NULL auto_increment,
114 114
   `message_name` varchar(50) NOT NULL default '',
115 115
   `message_title` varchar(200) NOT NULL default '',
116 116
   `message_text` text NULL,
117 117
   PRIMARY KEY  (`message_id`)
118
-) TYPE=MyISAM;
118
+) ENGINE=MyISAM;
119 119
 CREATE TABLE `".$tableprefix."fanfiction_modules` (
120 120
   `id` int(11) NOT NULL auto_increment,
121 121
   `name` varchar(100) NOT NULL default 'Test Module',
122 122
   `version` varchar(10) NOT NULL default '1.0',
123 123
   PRIMARY KEY  (`id`),
124 124
   KEY `name_version` (`name`,`version`)
125
-) TYPE=MyISAM;
125
+) ENGINE=MyISAM;
126 126
 CREATE TABLE `fanfiction_pagelinks` (
127 127
   `link_id` int(11) NOT NULL auto_increment,
128 128
   `link_name` varchar(50) NOT NULL default '',
... ...
@@ -133,7 +133,7 @@ CREATE TABLE `fanfiction_pagelinks` (
133 133
   PRIMARY KEY  (`link_id`),
134 134
   KEY `link_text` (`link_text`),
135 135
   KEY `link_name` (`link_name`)
136
-) TYPE=MyISAM;
136
+) ENGINE=MyISAM;
137 137
 CREATE TABLE `fanfiction_panels` (
138 138
   `panel_id` int(11) NOT NULL auto_increment,
139 139
   `panel_name` varchar(50) NOT NULL default 'unknown',
... ...
@@ -146,7 +146,7 @@ CREATE TABLE `fanfiction_panels` (
146 146
   PRIMARY KEY  (`panel_id`),
147 147
   KEY `panel_hidden` (`panel_hidden`),
148 148
   KEY `panel_type` (`panel_type`)
149
-) TYPE=MyISAM;
149
+) ENGINE=MyISAM;
150 150
 CREATE TABLE `fanfiction_series` (
151 151
   `seriesid` int(11) NOT NULL auto_increment,
152 152
   `title` varchar(200) NOT NULL default '',
... ...
@@ -165,7 +165,7 @@ CREATE TABLE `fanfiction_series` (
165 165
   KEY `challenges` (`challenges`),
166 166
   KEY `characters` (`characters`),
167 167
   KEY `classes` (`classes`)
168
-) TYPE=MyISAM;
168
+) ENGINE=MyISAM;
169 169
 
170 170
 CREATE TABLE `fanfiction_stats` (
171 171
   `sitekey` varchar(50) NOT NULL default '0',
... ...
@@ -178,4 +178,4 @@ CREATE TABLE `fanfiction_stats` (
178 178
   `members` int(11) NOT NULL default '0',
179 179
   `reviewers` int(11) NOT NULL default '0',
180 180
   `newestmember` int(11) NOT NULL default '0'
181
-) TYPE=MyISAM;
181
+) ENGINE=MyISAM;
... ...
@@ -225,6 +225,6 @@ CREATE TABLE `fanfiction_stats` (
225 225
   `members` int(11) NOT NULL default '0',
226 226
   `reviewers` int(11) NOT NULL default '0',
227 227
   `newestmember` int(11) NOT NULL default '0'
228
-) TYPE=MyISAM;
228
+) ENGINE=MyISAM;
229 229
 
230 230
 
... ...
@@ -737,14 +737,14 @@ ADD `rating` TINYINT( 4 ) NOT NULL");
737 737
   `field_code_out` text,
738 738
   `field_on` tinyint(1) NOT NULL default '0',
739 739
   PRIMARY KEY  (`field_id`)
740
-) TYPE=MyISAM;");
740
+) ENGINE=MyISAM;");
741 741
 $output .= "<tr><td>".$tableprefix."fanfiction_authorfields</td><td align='center'>" . ($authorfields ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
742 742
 				$authorinfo = dbquery("CREATE TABLE `".$tableprefix."fanfiction_authorinfo` (
743 743
   `uid` int(11) NOT NULL default '0',
744 744
   `field` int(11) NOT NULL default '0',
745 745
   `info` varchar(255) NOT NULL default ' ',
746 746
   KEY `uid` (`uid`)
747
-) TYPE=MyISAM;");
747
+) ENGINE=MyISAM;");
748 748
 $output .= "<tr><td>".$tableprefix."fanfiction_authorinfo</td><td align='center'>" . ($authorinfo ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
749 749
 				$authorprefs = dbquery("
750 750
 CREATE TABLE `".$tableprefix."fanfiction_authorprefs` (
... ...
@@ -763,7 +763,7 @@ CREATE TABLE `".$tableprefix."fanfiction_authorprefs` (
763 763
   `contact` tinyint(1) NOT NULL default '0',
764 764
   `stories` int(11) NOT NULL default '0',
765 765
    PRIMARY KEY  (`uid`)
766
-) TYPE=MyISAM;");
766
+) ENGINE=MyISAM;");
767 767
 $output .= "<tr><td>".$tableprefix."fanfiction_authorprefs</td><td align='center'>" . ($authorprefs ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
768 768
 				$blocks = dbquery("CREATE TABLE `".$tableprefix."fanfiction_blocks` (
769 769
   `block_id` int(11) NOT NULL auto_increment,
... ...
@@ -774,7 +774,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_authorprefs</td><td align='center
774 774
   `block_variables` text NOT NULL,
775 775
   PRIMARY KEY  (`block_id`),
776 776
   KEY `block_name` (`block_name`)
777
-) TYPE=MyISAM;");
777
+) ENGINE=MyISAM;");
778 778
 $output .= "<tr><td>".$tableprefix."fanfiction_blocks</td><td align='center'>" . ($blocks ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
779 779
 				$chapters = dbquery("CREATE TABLE `".$tableprefix."fanfiction_chapters` (
780 780
   `chapid` int(11) NOT NULL auto_increment,
... ...
@@ -796,14 +796,14 @@ $output .= "<tr><td>".$tableprefix."fanfiction_blocks</td><td align='center'>" .
796 796
   KEY `inorder` (`inorder`),
797 797
   KEY `title` (`title`),
798 798
   KEY `validated` (`validated`)
799
-) TYPE=MyISAM;");
799
+) ENGINE=MyISAM;");
800 800
 $output .= "<tr><td>".$tableprefix."fanfiction_chapters</td><td align='center'>" . ($chapters ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
801 801
 				$classes = dbquery("CREATE TABLE `".$tableprefix."fanfiction_classes` (
802 802
   `class_id` int(11) NOT NULL auto_increment,
803 803
   `class_type` int(11) NOT NULL default '0',
804 804
   `class_name` varchar(100) NOT NULL default '',
805 805
   PRIMARY KEY  (`class_id`)
806
-) TYPE=MyISAM;");
806
+) ENGINE=MyISAM;");
807 807
 
808 808
 $output .= "<tr><td>".$tableprefix."fanfiction_classes</td><td align='center'>" . ($classes ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
809 809
 				$classtypes = dbquery("CREATE TABLE `".$tableprefix."fanfiction_classtypes` (
... ...
@@ -812,13 +812,13 @@ $output .= "<tr><td>".$tableprefix."fanfiction_classes</td><td align='center'>"
812 812
   `classtype_title` varchar(50) NOT NULL default '',
813 813
   PRIMARY KEY  (`classtype_id`),
814 814
   KEY `classtype_title` (`classtype_title`)
815
-) TYPE=MyISAM;");
815
+) ENGINE=MyISAM;");
816 816
 $output .= "<tr><td>".$tableprefix."fanfiction_classtypes</td><td align='center'>" . ($classtypes ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
817 817
 $coauthors = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_coauthors` (
818 818
   `sid` int(11) NOT NULL default '0',
819 819
   `uid` int(11) NOT NULL default '0',
820 820
   PRIMARY KEY  (`sid`,`uid`)
821
-) TYPE=MyISAM;");
821
+) ENGINE=MyISAM;");
822 822
 $output .= "<tr><td>".$tableprefix."fanfiction_coauthors</td><td align='center'>" . ($coauthors ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
823 823
 				$codeblocks = dbquery("CREATE TABLE `".$tableprefix."fanfiction_codeblocks` (
824 824
   `code_id` int(11) NOT NULL auto_increment,
... ...
@@ -826,7 +826,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_coauthors</td><td align='center'>
826 826
   `code_type` varchar(20) default NULL,
827 827
   `code_module` varchar(60) default NULL,
828 828
   PRIMARY KEY  (`code_id`)
829
-) TYPE=MyISAM;");
829
+) ENGINE=MyISAM;");
830 830
 $output .= "<tr><td>".$tableprefix."fanfiction_codeblocks</td><td align='center'>" . ($codeblocks ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
831 831
 				$favorites = dbquery("CREATE TABLE `".$tableprefix."fanfiction_favorites` (
832 832
   `uid` int(11) NOT NULL default '0',
... ...
@@ -834,7 +834,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_codeblocks</td><td align='center'
834 834
   `type` char(2) NOT NULL default '',
835 835
   `comments` text NULL,
836 836
   KEY `uid` (`uid`)
837
-) TYPE=MyISAM;");
837
+) ENGINE=MyISAM;");
838 838
 $output .= "<tr><td>".$tableprefix."fanfiction_favorites</td><td align='center'>" . ($favorites ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
839 839
 				$inseries = dbquery("CREATE TABLE `".$tableprefix."fanfiction_inseries` (
840 840
   `seriesid` int(11) NOT NULL default '0',
... ...
@@ -844,7 +844,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_favorites</td><td align='center'>
844 844
   `inorder` int(11) NOT NULL default '0',
845 845
    PRIMARY KEY  (`sid`,`seriesid`, `subseriesid`),
846 846
    KEY `seriesid` (`seriesid`,`inorder`)
847
-) TYPE=MyISAM;");
847
+) ENGINE=MyISAM;");
848 848
 $output .= "<tr><td>".$tableprefix."fanfiction_inseries</td><td align='center'>" . ($inseries ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
849 849
 				$logs = dbquery("CREATE TABLE `".$tableprefix."fanfiction_log` (
850 850
   `log_id` int(11) NOT NULL auto_increment,
... ...
@@ -854,7 +854,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_inseries</td><td align='center'>"
854 854
   `log_timestamp` timestamp NOT NULL,
855 855
   `log_type` varchar(2) NOT NULL,
856 856
   PRIMARY KEY  (`log_id`)
857
-) TYPE=MyISAM");
857
+) ENGINE=MyISAM");
858 858
 $output .= "<tr><td>".$tableprefix."fanfiction_log</td><td align='center'>" . ($logs ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
859 859
 				$messages = dbquery("CREATE TABLE `".$tableprefix."fanfiction_messages` (
860 860
   `message_id` int(11) NOT NULL auto_increment,
... ...
@@ -862,7 +862,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_log</td><td align='center'>" . ($
862 862
   `message_title` varchar(200) NOT NULL default '',
863 863
   `message_text` text NULL,
864 864
   PRIMARY KEY  (`message_id`)
865
-) TYPE=MyISAM;");
865
+) ENGINE=MyISAM;");
866 866
 $output .= "<tr><td>".$tableprefix."fanfiction_messages</td><td align='center'>" . ($messages ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
867 867
 				$modules = dbquery("
868 868
 CREATE TABLE `".$tableprefix."fanfiction_modules` (
... ...
@@ -884,7 +884,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_modules</td><td align='center'>"
884 884
   PRIMARY KEY  (`link_id`),
885 885
   KEY `link_text` (`link_text`),
886 886
   KEY `link_name` (`link_name`)
887
-) TYPE=MyISAM;");
887
+) ENGINE=MyISAM;");
888 888
 $output .= "<tr><td>".$tableprefix."fanfiction_pagelinks</td><td align='center'>" . ($pagelinks ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
889 889
 				$panels = dbquery("CREATE TABLE `".$tableprefix."fanfiction_panels` (
890 890
   `panel_id` int(11) NOT NULL auto_increment,
... ...
@@ -898,7 +898,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_pagelinks</td><td align='center'>
898 898
   PRIMARY KEY  (`panel_id`),
899 899
   KEY `panel_hidden` (`panel_hidden`),
900 900
   KEY `panel_type` (`panel_type`)
901
-) TYPE=MyISAM;");
901
+) ENGINE=MyISAM;");
902 902
 $output .= "<tr><td>".$tableprefix."fanfiction_panels</td><td align='center'>" . ($panels ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
903 903
 				$series = dbquery("CREATE TABLE `".$tableprefix."fanfiction_series` (
904 904
   `seriesid` int(11) NOT NULL auto_increment,
... ...
@@ -917,7 +917,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_panels</td><td align='center'>" .
917 917
   KEY `characters` (`characters`),
918 918
   KEY `classes` (`classes`),
919 919
   KEY `owner` (`uid`,`title`)
920
-) TYPE=MyISAM;");
920
+) ENGINE=MyISAM;");
921 921
 $output .= "<tr><td>".$tableprefix."fanfiction_series</td><td align='center'>" . ($series ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
922 922
 	$stats = dbquery("CREATE TABLE `".$tableprefix."fanfiction_stats` (
923 923
   `sitekey` varchar(50) NOT NULL default '0',
... ...
@@ -930,7 +930,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_series</td><td align='center'>" .
930 930
   `members` int(11) NOT NULL default '0',
931 931
   `reviewers` int(11) NOT NULL default '0',
932 932
   `newestmember` int(11) NOT NULL default '0'
933
-) TYPE=MyISAM");
933
+) ENGINE=MyISAM");
934 934
 	dbquery("INSERT INTO ".$tableprefix."fanfiction_stats(`sitekey`) VALUES('".$sitekey."')");
935 935
 $output .= "<tr><td>".$tableprefix."fanfiction_stats</td><td align='center'>" . ($stats ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
936 936
 $output .= "</table>";
... ...
@@ -1109,7 +1109,7 @@ if(!empty(\$sitekey)) \$dbconnect = dbconnect(\$dbhost, \$dbuser,\$dbpass, \$dbn
1109 1109
   `smtp_username` varchar(50) default NULL,
1110 1110
   `smtp_password` varchar(50) default NULL,
1111 1111
   PRIMARY KEY  (`sitekey`)
1112
-) TYPE=MyISAM;");
1112
+) ENGINE=MyISAM;");
1113 1113
 if($settings) $output .= write_message("<img src=\"../images/check.gif\"> "._SETTINGSTABLESUCCESS." <br /><a href='upgrade11.php?step=2&amp;settingsprefix=".$_POST['settingsprefix']."'>"._CONTINUE."</a>");
1114 1114
 else $output .= write_message(_SETTINGSTABLEAUTOFAIL." <br /><a href='upgrade11.php?step=2&amp;settingsprefix=".$_POST['settingsprefix']."'>"._CONTINUE."</a> ");
1115 1115
 		}
... ...
@@ -823,14 +823,14 @@ switch($_GET['step']) {
823 823
   `field_code_out` text,
824 824
   `field_on` tinyint(1) NOT NULL default '0',
825 825
   PRIMARY KEY  (`field_id`)
826
-) TYPE=MyISAM;");
826
+) ENGINE=MyISAM;");
827 827
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_authorfields</td><td align='center'>" . ($authorfields ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
828 828
 				$authorinfo = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_authorinfo` (
829 829
   `uid` int(11) NOT NULL default '0',
830 830
   `field` int(11) NOT NULL default '0',
831 831
   `info` varchar(255) NOT NULL default ' ',
832 832
   PRIMARY KEY  (`uid`,`field`),
833
-  KEY `uid` (`uid`)) TYPE=MyISAM;");
833
+  KEY `uid` (`uid`)) ENGINE=MyISAM;");
834 834
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_authorinfo</td><td align='center'>" . ($authorinfo ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
835 835
 				$authorprefs = dbquery("
836 836
 CREATE TABLE `".TABLEPREFIX."fanfiction_authorprefs` (
... ...
@@ -849,7 +849,7 @@ CREATE TABLE `".TABLEPREFIX."fanfiction_authorprefs` (
849 849
   `contact` tinyint(1) NOT NULL default '0',
850 850
   `stories` int(11) NOT NULL default '0',
851 851
    PRIMARY KEY  (`uid`)
852
-) TYPE=MyISAM;");
852
+) ENGINE=MyISAM;");
853 853
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_authorprefs</td><td align='center'>" . ($authorprefs ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";				
854 854
 				$blocks = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_blocks` (
855 855
   `block_id` int(11) NOT NULL auto_increment,
... ...
@@ -860,7 +860,7 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_authorprefs</td><td align='center'
860 860
   `block_variables` text NOT NULL,
861 861
   PRIMARY KEY  (`block_id`),
862 862
   KEY `block_name` (`block_name`)
863
-) TYPE=MyISAM;");
863
+) ENGINE=MyISAM;");
864 864
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_blocks</td><td align='center'>" . ($blocks ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
865 865
 				$classes = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_classes` (
866 866
   `class_id` int(11) NOT NULL auto_increment,
... ...
@@ -868,7 +868,7 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_blocks</td><td align='center'>" .
868 868
   `class_name` varchar(100) NOT NULL default '',
869 869
   PRIMARY KEY  (`class_id`),
870 870
   KEY `byname` (`class_type`,`class_name`,`class_id`)
871
-) TYPE=MyISAM;");
871
+) ENGINE=MyISAM;");
872 872
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_classes</td><td align='center'>" . ($classes ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
873 873
 				$classtypes = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_classtypes` (
874 874
   `classtype_id` int(11) NOT NULL auto_increment,
... ...
@@ -876,13 +876,13 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_classes</td><td align='center'>" .
876 876
   `classtype_title` varchar(50) NOT NULL default '',
877 877
   PRIMARY KEY  (`classtype_id`),
878 878
   UNIQUE KEY `classtype_name` (`classtype_name`)
879
-) TYPE=MyISAM;");
879
+) ENGINE=MyISAM;");
880 880
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_classtypes</td><td align='center'>" . ($classtypes ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
881 881
 $coauthors = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_coauthors` (
882 882
   `sid` int(11) NOT NULL default '0',
883 883
   `uid` int(11) NOT NULL default '0',
884 884
   PRIMARY KEY  (`sid`,`uid`)
885
-) TYPE=MyISAM;");
885
+) ENGINE=MyISAM;");
886 886
 $output .= "<tr><td>".$tableprefix."fanfiction_coauthors</td><td align='center'>" . ($coauthors ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
887 887
 				$codeblocks = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_codeblocks` (
888 888
   `code_id` int(11) NOT NULL auto_increment,
... ...
@@ -891,7 +891,7 @@ $output .= "<tr><td>".$tableprefix."fanfiction_coauthors</td><td align='center'>
891 891
   `code_module` varchar(60) default NULL,
892 892
   PRIMARY KEY  (`code_id`),
893 893
   KEY `code_type` (`code_type`)
894
-) TYPE=MyISAM;");
894
+) ENGINE=MyISAM;");
895 895
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_codeblocks</td><td align='center'>" . ($codeblocks ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
896 896
 				$favorites = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_favorites` (
897 897
   `uid` int(11) NOT NULL default '0',
... ...
@@ -900,7 +900,7 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_codeblocks</td><td align='center'>
900 900
   `comments` text NOT NULL,
901 901
   UNIQUE KEY `byitem` (`item`,`type`,`uid`),
902 902
   UNIQUE KEY `byuid` (`uid`,`type`,`item`)
903
-) TYPE=MyISAM;");
903
+) ENGINE=MyISAM;");
904 904
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_favorites</td><td align='center'>" . ($favorites ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
905 905
 				$logs = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_log` (
906 906
   `log_id` int(11) NOT NULL auto_increment,
... ...
@@ -910,7 +910,7 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_favorites</td><td align='center'>"
910 910
   `log_timestamp` timestamp NOT NULL,
911 911
   `log_type` varchar(2) NOT NULL,
912 912
   PRIMARY KEY  (`log_id`)
913
-) TYPE=MyISAM");
913
+) ENGINE=MyISAM");
914 914
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_log</td><td align='center'>" . ($logs ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
915 915
 				$messages = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_messages` (
916 916
   `message_id` int(11) NOT NULL auto_increment,
... ...
@@ -919,7 +919,7 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_log</td><td align='center'>" . ($l
919 919
   `message_text` text NOT NULL,
920 920
   PRIMARY KEY  (`message_id`),
921 921
   KEY `message_name` (`message_name`)
922
-) TYPE=MyISAM;");
922
+) ENGINE=MyISAM;");
923 923
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_messages</td><td align='center'>" . ($messages ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
924 924
 				$modules = dbquery("
925 925
 CREATE TABLE `".TABLEPREFIX."fanfiction_modules` (
... ...
@@ -940,7 +940,7 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_modules</td><td align='center'>" .
940 940
   `link_access` tinyint(4) NOT NULL default '0',
941 941
   PRIMARY KEY  (`link_id`),
942 942
   KEY `link_name` (`link_name`)
943
-) TYPE=MyISAM;");
943
+) ENGINE=MyISAM;");
944 944
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_pagelinks</td><td align='center'>" . ($pagelinks ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
945 945
 				$panels = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_panels` (
946 946
   `panel_id` int(11) NOT NULL auto_increment,
... ...
@@ -953,7 +953,7 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_pagelinks</td><td align='center'>"
953 953
   `panel_type` varchar(20) NOT NULL default 'A',
954 954
   PRIMARY KEY  (`panel_id`),
955 955
   KEY `panel_type` (`panel_type`,`panel_name`)
956
-) TYPE=MyISAM;");
956
+) ENGINE=MyISAM;");
957 957
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_panels</td><td align='center'>" . ($panels ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
958 958
 	$stats = dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_stats` (
959 959
   `sitekey` varchar(50) NOT NULL default '0',
... ...
@@ -966,7 +966,7 @@ $output .= "<tr><td>".TABLEPREFIX."fanfiction_panels</td><td align='center'>" .
966 966
   `members` int(11) NOT NULL default '0',
967 967
   `reviewers` int(11) NOT NULL default '0',
968 968
   `newestmember` int(11) NOT NULL default '0'
969
-) TYPE=MyISAM");
969
+) ENGINE=MyISAM");
970 970
 	dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_stats(`sitekey`, `newestmember`) VALUES('".SITEKEY."', '1')");
971 971
 $output .= "<tr><td>".TABLEPREFIX."fanfiction_stats</td><td align='center'>" . ($stats ? "<img src=\"../images/check.gif\">" : "<img src=\"../images/X.gif\">") ."</td></tr>";
972 972
 $output .= "</table>";
... ...
@@ -1157,7 +1157,7 @@ if(!empty(\$sitekey)) \$dbconnect = dbconnect(\$dbhost, \$dbuser,\$dbpass, \$dbn
1157 1157
   `smtp_username` varchar(50) default NULL,
1158 1158
   `smtp_password` varchar(50) default NULL,
1159 1159
   PRIMARY KEY  (`sitekey`)
1160
-) TYPE=MyISAM;");
1160
+) ENGINE=MyISAM;");
1161 1161
 if($settings) $output .= write_message("<img src=\"../images/check.gif\"> "._SETTINGSTABLESUCCESS." <br /><a href='upgrade20.php?step=2&amp;settingsprefix=".$_POST['settingsprefix']."'>"._CONTINUE."</a>");
1162 1162
 else $output .= write_message(_SETTINGSTABLEAUTOFAIL." <br /><a href='upgrade20.php?step=2&amp;settingsprefix=".$_POST['settingsprefix']."'>"._CONTINUE."</a> ");
1163 1163
 		}
... ...
@@ -63,7 +63,7 @@ if($confirm == "yes") {
63 63
 	  KEY `uid` (`uid`),
64 64
 	  KEY `title_2` (`title`),
65 65
 	  KEY `characters` (`characters`)
66
-	) TYPE=MyISAM;");
66
+	) ENGINE=MyISAM;");
67 67
 	dbquery("INSERT INTO `".TABLEPREFIX."fanfiction_modules`(`version`, `name`) VALUES('$moduleVersion', '$moduleName')");
68 68
 	$output = write_message(_ACTIONSUCCESSFUL);
69 69
 }
... ...
@@ -105,7 +105,7 @@ CREATE TABLE `".TABLEPREFIX."fanfiction_stats` (
105 105
   `members` int(11) NOT NULL default '0',
106 106
   `reviewers` int(11) NOT NULL default '0',
107 107
   `newestmember` int(11) NOT NULL default '0'
108
-) TYPE=MyISAM");
108
+) ENGINE=MyISAM");
109 109
 		dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_stats(`sitekey`) VALUES('SITEKEY')");
110 110
 		dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_inseries` DROP `updated`");
111 111
 		dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_news` ADD `comments` INT NOT NULL DEFAULT '0'");
... ...
@@ -210,7 +210,7 @@ CREATE TABLE `".TABLEPREFIX."fanfiction_modules` (
210 210
   `sid` int(11) NOT NULL default '0',
211 211
   `uid` int(11) NOT NULL default '0',
212 212
   PRIMARY KEY  (`sid`,`uid`)
213
-) TYPE=MyISAM;");
213
+) ENGINE=MyISAM;");
214 214
 		dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_authorprefs` ADD `stories` INT NOT NULL DEFAULT '0'");
215 215
 		$alist = array( );
216 216
 		$authors = dbquery("SELECT uid, count(uid) AS count FROM ".TABLEPREFIX."fanfiction_stories WHERE validated > 0 GROUP BY uid");
... ...
@@ -240,7 +240,7 @@ CREATE TABLE `".TABLEPREFIX."fanfiction_modules` (
240 240
 			  `sid` int(11) NOT NULL default '0',
241 241
 			  `uid` int(11) NOT NULL default '0',
242 242
 			  PRIMARY KEY  (`sid`,`uid`)
243
-			) TYPE=MyISAM;");
243
+			) ENGINE=MyISAM;");
244 244
 			dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_authorprefs` ADD `stories` INT NOT NULL DEFAULT '0'");
245 245
 		}		
246 246
 		$authors = dbquery("SELECT uid, count(uid) AS count FROM ".TABLEPREFIX."fanfiction_stories WHERE validated > 0 GROUP BY uid");
... ...
@@ -263,7 +263,7 @@ CREATE TABLE `".TABLEPREFIX."fanfiction_modules` (
263 263
 			  `sid` int(11) NOT NULL default '0',
264 264
 			  `uid` int(11) NOT NULL default '0',
265 265
 			  PRIMARY KEY  (`sid`,`uid`)
266
-			) TYPE=MyISAM;");
266
+			) ENGINE=MyISAM;");
267 267
 			dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_authorprefs` ADD `stories` INT NOT NULL DEFAULT '0'");
268 268
 		}
269 269
 		$storiesAdded = dbquery("SHOW COLUMNS FROM ".TABLEPREFIX."fanfiction_authorprefs LIKE 'stories'");