Skip to content

Commit c5bdf04

Browse files
author
Marius Burkard
committed
- removed ENGINE=MyISAM from sql files, fixes #5342
1 parent 0c5140a commit c5bdf04

23 files changed

+118
-118
lines changed

‎install/sql/incremental/upd_0002.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `sys_session` (
55
`session_data` longtext,
66
PRIMARY KEY (`session_id`),
77
KEY `last_updated` (`last_updated`)
8-
) ENGINE=MyISAM;
8+
);

‎install/sql/incremental/upd_0004.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CREATE TABLE `help_faq_sections` (
1111
`sys_perm_group` varchar(5) DEFAULT NULL,
1212
`sys_perm_other` varchar(5) DEFAULT NULL,
1313
PRIMARY KEY (`hfs_id`)
14-
) ENGINE=MyISAM AUTO_INCREMENT=1;
14+
) AUTO_INCREMENT=1;
1515

1616
INSERT INTO `help_faq_sections` VALUES (1,'General',0,NULL,NULL,NULL,NULL,NULL);
1717

@@ -27,7 +27,7 @@ CREATE TABLE `help_faq` (
2727
`sys_perm_group` varchar(5) DEFAULT NULL,
2828
`sys_perm_other` varchar(5) DEFAULT NULL,
2929
PRIMARY KEY (`hf_id`)
30-
) ENGINE=MyISAM AUTO_INCREMENT=1;
30+
) AUTO_INCREMENT=1;
3131

3232
INSERT INTO `help_faq` VALUES (1,1,0,'I\'d like to know ...','Yes, of course.',1,1,'riud','riud','r');
3333

‎install/sql/incremental/upd_0007.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ CREATE TABLE IF NOT EXISTS `mail_mailinglist` (
1414
`email` varchar(255) NOT NULL,
1515
`password` varchar(255) NOT NULL,
1616
PRIMARY KEY (`mailinglist_id`)
17-
) ENGINE=MyISAM AUTO_INCREMENT=1;
17+
) AUTO_INCREMENT=1;
1818

1919
DROP TABLE `mail_mailman_domain`;

‎install/sql/incremental/upd_0009.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `proxy_reverse` (
1010
`rewrite_url_dst` varchar(100) NOT NULL,
1111
`active` enum('n','y') NOT NULL default 'y',
1212
PRIMARY KEY (`rewrite_id`)
13-
) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
13+
) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
1414

1515

1616
CREATE TABLE IF NOT EXISTS `firewall_filter` (
@@ -38,7 +38,7 @@ CREATE TABLE IF NOT EXISTS `firewall_filter` (
3838
`active` enum('n','y') NOT NULL default 'y',
3939
`client_id` int(11) NOT NULL,
4040
PRIMARY KEY (`firewall_id`)
41-
) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
41+
) AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
4242

4343
CREATE TABLE IF NOT EXISTS `firewall_forward` (
4444
`firewall_id` int(11) unsigned NOT NULL auto_increment,
@@ -59,7 +59,7 @@ CREATE TABLE IF NOT EXISTS `firewall_forward` (
5959
`active` enum('n','y') NOT NULL default 'y',
6060
`client_id` int(11) NOT NULL,
6161
PRIMARY KEY (`firewall_id`)
62-
) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
62+
) AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
6363

6464
alter table `server` add column `proxy_server` tinyint(1) not null after `vserver_server`;
6565
alter table `server` add column `firewall_server` tinyint(1) not null after `proxy_server`;

‎install/sql/incremental/upd_0012.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `openvz_ip` (
1414
`vm_id` int(11) NOT NULL DEFAULT '0',
1515
`reserved` varchar(255) NOT NULL DEFAULT 'n',
1616
PRIMARY KEY (`ip_address_id`)
17-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
17+
) DEFAULT CHARSET=utf8 ;
1818

1919
--
2020
-- Dumping data for table `openvz_ip`
@@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS `openvz_ostemplate` (
4040
`active` varchar(255) NOT NULL DEFAULT 'y',
4141
`description` text,
4242
PRIMARY KEY (`ostemplate_id`)
43-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
43+
) DEFAULT CHARSET=utf8 ;
4444

4545
--
4646
-- Dumping data for table `openvz_ostemplate`
@@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
100100
`create_dns` varchar(1) NOT NULL DEFAULT 'n',
101101
`capability` varchar(255) DEFAULT NULL,
102102
PRIMARY KEY (`template_id`)
103-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
103+
) DEFAULT CHARSET=utf8 ;
104104

105105
--
106106
-- Dumping data for table `openvz_template`
@@ -119,7 +119,7 @@ CREATE TABLE IF NOT EXISTS `openvz_traffic` (
119119
`traffic_date` date NOT NULL,
120120
`traffic_bytes` bigint(32) unsigned NOT NULL DEFAULT '0',
121121
PRIMARY KEY (`veid`,`traffic_date`)
122-
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
122+
) DEFAULT CHARSET=utf8;
123123

124124
--
125125
-- Dumping data for table `openvz_traffic`
@@ -164,7 +164,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
164164
`capability` text NOT NULL,
165165
`config` mediumtext NOT NULL,
166166
PRIMARY KEY (`vm_id`)
167-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
167+
) DEFAULT CHARSET=utf8 ;
168168

169169
--
170170
-- Dumping data for table `openvz_vm`

‎install/sql/incremental/upd_0013.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ CREATE TABLE `iptables` (
1616
`target` varchar(10) DEFAULT NULL COMMENT 'ACCEPT DROP REJECT LOG',
1717
`active` enum('n','y') NOT NULL DEFAULT 'y',
1818
PRIMARY KEY (`iptables_id`)
19-
) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
19+
) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
2020

‎install/sql/incremental/upd_0019.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `help_faq` (
1010
`sys_perm_group` varchar(5) DEFAULT NULL,
1111
`sys_perm_other` varchar(5) DEFAULT NULL,
1212
PRIMARY KEY (`hf_id`)
13-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
13+
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
1414

1515
CREATE TABLE IF NOT EXISTS `help_faq_sections` (
1616
`hfs_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS `help_faq_sections` (
2222
`sys_perm_group` varchar(5) DEFAULT NULL,
2323
`sys_perm_other` varchar(5) DEFAULT NULL,
2424
PRIMARY KEY (`hfs_id`)
25-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
25+
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
2626

2727
CREATE TABLE IF NOT EXISTS `web_folder` (
2828
`web_folder_id` bigint(20) NOT NULL AUTO_INCREMENT,
@@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS `web_folder` (
3636
`path` varchar(255) DEFAULT NULL,
3737
`active` varchar(255) NOT NULL DEFAULT 'y',
3838
PRIMARY KEY (`web_folder_id`)
39-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
39+
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
4040

4141
CREATE TABLE IF NOT EXISTS `web_folder_user` (
4242
`web_folder_user_id` bigint(20) NOT NULL AUTO_INCREMENT,
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `web_folder_user` (
5050
`password` varchar(255) DEFAULT NULL,
5151
`active` varchar(255) NOT NULL DEFAULT 'y',
5252
PRIMARY KEY (`web_folder_user_id`)
53-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
53+
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
5454

5555
DROP TABLE `mail_greylist`;
5656
DROP TABLE `firewall_filter`;

‎install/sql/incremental/upd_0028.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ CREATE TABLE `web_backup` (
99
`tstamp` int(10) unsigned NOT NULL,
1010
`filename` varchar(255) NOT NULL,
1111
PRIMARY KEY (`backup_id`)
12-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
12+
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

‎install/sql/incremental/upd_0031.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ CREATE TABLE `server_php` (
1414
`php_fpm_ini_dir` varchar(255) DEFAULT NULL,
1515
`php_fpm_pool_dir` varchar(255) DEFAULT NULL,
1616
PRIMARY KEY (`server_php_id`)
17-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
17+
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
1818
ALTER TABLE `web_domain` ADD `fastcgi_php_version` VARCHAR( 255 ) NULL DEFAULT NULL;

‎install/sql/incremental/upd_0033.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `client_circle` (
1010
`description` text,
1111
`active` enum('n','y') NOT NULL default 'y',
1212
PRIMARY KEY (`circle_id`)
13-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
13+
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

0 commit comments

Comments
 (0)