Commit c5bdf045 authored by Marius Burkard's avatar Marius Burkard

- removed ENGINE=MyISAM from sql files, fixes #5342

parent 0c5140ab
......@@ -5,4 +5,4 @@ CREATE TABLE IF NOT EXISTS `sys_session` (
`session_data` longtext,
PRIMARY KEY (`session_id`),
KEY `last_updated` (`last_updated`)
) ENGINE=MyISAM;
\ No newline at end of file
);
\ No newline at end of file
......@@ -11,7 +11,7 @@ CREATE TABLE `help_faq_sections` (
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
PRIMARY KEY (`hfs_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
) AUTO_INCREMENT=1;
INSERT INTO `help_faq_sections` VALUES (1,'General',0,NULL,NULL,NULL,NULL,NULL);
......@@ -27,7 +27,7 @@ CREATE TABLE `help_faq` (
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
PRIMARY KEY (`hf_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
) AUTO_INCREMENT=1;
INSERT INTO `help_faq` VALUES (1,1,0,'I\'d like to know ...','Yes, of course.',1,1,'riud','riud','r');
......@@ -14,6 +14,6 @@ CREATE TABLE IF NOT EXISTS `mail_mailinglist` (
`email` varchar(255) NOT NULL,
`password` varchar(255) NOT NULL,
PRIMARY KEY (`mailinglist_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
) AUTO_INCREMENT=1;
DROP TABLE `mail_mailman_domain`;
\ No newline at end of file
......@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `proxy_reverse` (
`rewrite_url_dst` varchar(100) NOT NULL,
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`rewrite_id`)
) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `firewall_filter` (
......@@ -38,7 +38,7 @@ CREATE TABLE IF NOT EXISTS `firewall_filter` (
`active` enum('n','y') NOT NULL default 'y',
`client_id` int(11) NOT NULL,
PRIMARY KEY (`firewall_id`)
) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
) AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `firewall_forward` (
`firewall_id` int(11) unsigned NOT NULL auto_increment,
......@@ -59,7 +59,7 @@ CREATE TABLE IF NOT EXISTS `firewall_forward` (
`active` enum('n','y') NOT NULL default 'y',
`client_id` int(11) NOT NULL,
PRIMARY KEY (`firewall_id`)
) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
) AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
alter table `server` add column `proxy_server` tinyint(1) not null after `vserver_server`;
alter table `server` add column `firewall_server` tinyint(1) not null after `proxy_server`;
......
......@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `openvz_ip` (
`vm_id` int(11) NOT NULL DEFAULT '0',
`reserved` varchar(255) NOT NULL DEFAULT 'n',
PRIMARY KEY (`ip_address_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
--
-- Dumping data for table `openvz_ip`
......@@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS `openvz_ostemplate` (
`active` varchar(255) NOT NULL DEFAULT 'y',
`description` text,
PRIMARY KEY (`ostemplate_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
--
-- Dumping data for table `openvz_ostemplate`
......@@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
`create_dns` varchar(1) NOT NULL DEFAULT 'n',
`capability` varchar(255) DEFAULT NULL,
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
--
-- Dumping data for table `openvz_template`
......@@ -119,7 +119,7 @@ CREATE TABLE IF NOT EXISTS `openvz_traffic` (
`traffic_date` date NOT NULL,
`traffic_bytes` bigint(32) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`veid`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8;
--
-- Dumping data for table `openvz_traffic`
......@@ -164,7 +164,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
`capability` text NOT NULL,
`config` mediumtext NOT NULL,
PRIMARY KEY (`vm_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
--
-- Dumping data for table `openvz_vm`
......
......@@ -16,5 +16,5 @@ CREATE TABLE `iptables` (
`target` varchar(10) DEFAULT NULL COMMENT 'ACCEPT DROP REJECT LOG',
`active` enum('n','y') NOT NULL DEFAULT 'y',
PRIMARY KEY (`iptables_id`)
) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
......@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `help_faq` (
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
PRIMARY KEY (`hf_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
CREATE TABLE IF NOT EXISTS `help_faq_sections` (
`hfs_id` int(11) NOT NULL AUTO_INCREMENT,
......@@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS `help_faq_sections` (
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
PRIMARY KEY (`hfs_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
CREATE TABLE IF NOT EXISTS `web_folder` (
`web_folder_id` bigint(20) NOT NULL AUTO_INCREMENT,
......@@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS `web_folder` (
`path` varchar(255) DEFAULT NULL,
`active` varchar(255) NOT NULL DEFAULT 'y',
PRIMARY KEY (`web_folder_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
CREATE TABLE IF NOT EXISTS `web_folder_user` (
`web_folder_user_id` bigint(20) NOT NULL AUTO_INCREMENT,
......@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `web_folder_user` (
`password` varchar(255) DEFAULT NULL,
`active` varchar(255) NOT NULL DEFAULT 'y',
PRIMARY KEY (`web_folder_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
DROP TABLE `mail_greylist`;
DROP TABLE `firewall_filter`;
......
......@@ -9,4 +9,4 @@ CREATE TABLE `web_backup` (
`tstamp` int(10) unsigned NOT NULL,
`filename` varchar(255) NOT NULL,
PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
......@@ -14,5 +14,5 @@ CREATE TABLE `server_php` (
`php_fpm_ini_dir` varchar(255) DEFAULT NULL,
`php_fpm_pool_dir` varchar(255) DEFAULT NULL,
PRIMARY KEY (`server_php_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `web_domain` ADD `fastcgi_php_version` VARCHAR( 255 ) NULL DEFAULT NULL;
\ No newline at end of file
......@@ -10,4 +10,4 @@ CREATE TABLE IF NOT EXISTS `client_circle` (
`description` text,
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`circle_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
\ No newline at end of file
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
\ No newline at end of file
......@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `aps_instances` (
`package_id` int(4) NOT NULL,
`instance_status` int(4) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
-- --------------------------------------------------------
......@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `aps_instances_settings` (
`name` varchar(255) NOT NULL,
`value` text NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
-- --------------------------------------------------------
......@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS `aps_packages` (
`package_url` TEXT NOT NULL,
`package_status` int(1) NOT NULL DEFAULT '2',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
-- --------------------------------------------------------
......@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS `aps_settings` (
`value` text NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
-- --------------------------------------------------------
......
......@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `sys_theme` (
`username` varchar(64) NOT NULL,
`logo_url` varchar(255) NOT NULL,
PRIMARY KEY (`var_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
) DEFAULT CHARSET=utf8 ;
-- --------------------------------------------------------
......
......@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `web_database_user` (
`database_user` varchar(64) DEFAULT NULL,
`database_password` varchar(64) DEFAULT NULL,
PRIMARY KEY (`database_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
......
......@@ -21,4 +21,4 @@ CREATE TABLE IF NOT EXISTS `directive_snippets` (
`snippet` mediumtext,
`active` enum('n','y') NOT NULL DEFAULT 'y',
PRIMARY KEY (`directive_snippets_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
......@@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS `dns_slave` (
PRIMARY KEY (`id`),
KEY `origin` (`origin`),
KEY `active` (`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `dns_slave` DROP INDEX `origin`;
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);
\ No newline at end of file
......@@ -4,7 +4,7 @@ CREATE TABLE `client_template_assigned` (
`client_template_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`assigned_template_id`),
KEY `client_id` (`client_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `client` ADD `gender` enum('','m','f') NOT NULL DEFAULT '' AFTER `company_id`,
ADD `locked` enum('n','y') NOT NULL DEFAULT 'n' AFTER `created_at`,
......
......@@ -4,4 +4,4 @@ CREATE TABLE IF NOT EXISTS `sys_cron` (
`next_run` datetime NULL DEFAULT NULL,
`running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8;
......@@ -8,7 +8,7 @@ CREATE TABLE `mail_backup` (
`filename` varchar(255) NOT NULL,
`filesize` VARCHAR(10) NOT NULL,
PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `mail_user` ADD `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none';
ALTER TABLE `mail_user` ADD `backup_copies` INT NOT NULL DEFAULT '1';
......@@ -12,7 +12,7 @@ CREATE TABLE `client_message_template` (
`subject` varchar(255) DEFAULT NULL,
`message` text,
PRIMARY KEY (`client_message_template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `spamfilter_policy` ADD `policyd_quota_in` int(11) NOT NULL DEFAULT '-1',
ADD `policyd_quota_in_period` int(11) NOT NULL DEFAULT '24',
ADD `policyd_quota_out` int(11) NOT NULL DEFAULT '-1',
......
......@@ -77,4 +77,4 @@ CREATE TABLE IF NOT EXISTS `dns_slave` (
PRIMARY KEY (`id`),
UNIQUE KEY `slave` (`origin`,`server_id`),
KEY `active` (`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
......@@ -126,7 +126,7 @@ CREATE TABLE `xmpp_domain` (
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
KEY `domain_active` (`domain`,`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
--
-- Table structure for table `xmpp_user`
......@@ -146,7 +146,7 @@ CREATE TABLE `xmpp_user` (
PRIMARY KEY (`xmppuser_id`),
KEY `server_id` (`server_id`,`jid`),
KEY `jid_active` (`jid`,`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
......@@ -176,7 +176,7 @@ CREATE TABLE `server_ip_map` (
`destination_ip` varchar(35) DEFAULT '',
`active` enum('n','y') NOT NULL DEFAULT 'y',
PRIMARY KEY (`server_ip_map_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `web_domain` ADD COLUMN `rewrite_to_https` ENUM('y','n') NOT NULL DEFAULT 'n' AFTER `seo_redirect`;
......@@ -199,7 +199,7 @@ CREATE TABLE `ftp_traffic` (
`in_bytes` bigint(32) unsigned NOT NULL,
`out_bytes` bigint(32) unsigned NOT NULL,
UNIQUE KEY (`hostname`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `mail_forwarding` ADD COLUMN `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `active`;
UPDATE `mail_forwarding` SET `allow_send_as` = 'y' WHERE `type` = 'alias';
......
......@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS `dns_ssl_ca` (
`ca_critical` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY (`ca_issue`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `dns_ssl_ca` ADD UNIQUE(`ca_issue`);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment