Skip to content

Commit 31a42f8

Browse files
committed
Fixes #6641 Multiserver sync issues with some older systems
1 parent b5c22ae commit 31a42f8

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ALTER TABLE `spamfilter_policy`
2+
CHANGE `warnvirusrecip` `warnvirusrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N',
3+
CHANGE `warnbannedrecip` `warnbannedrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N',
4+
CHANGE `warnbadhrecip` `warnbadhrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N';
5+
ALTER TABLE `sys_ini` CHANGE `default_logo` `default_logo` TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL;
6+
ALTER TABLE `sys_ini` CHANGE `custom_logo` `custom_logo` TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL;

install/sql/ispconfig3.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,9 +1532,9 @@ CREATE TABLE `spamfilter_policy` (
15321532
`addr_extension_spam` varchar(64) default NULL,
15331533
`addr_extension_banned` varchar(64) default NULL,
15341534
`addr_extension_bad_header` varchar(64) default NULL,
1535-
`warnvirusrecip` enum('N','Y') default 'N',
1536-
`warnbannedrecip` enum('N','Y') default 'N',
1537-
`warnbadhrecip` enum('N','Y') default 'N',
1535+
`warnvirusrecip` VARCHAR(1) NULL default 'N',
1536+
`warnbannedrecip` VARCHAR(1) NULL default 'N',
1537+
`warnbadhrecip` VARCHAR(1) NULL default 'N',
15381538
`newvirus_admin` varchar(64) default NULL,
15391539
`virus_admin` varchar(64) default NULL,
15401540
`banned_admin` varchar(64) default NULL,
@@ -1741,8 +1741,8 @@ CREATE TABLE `sys_group` (
17411741
CREATE TABLE `sys_ini` (
17421742
`sysini_id` int(11) unsigned NOT NULL auto_increment,
17431743
`config` longtext,
1744-
`default_logo` text NOT NULL,
1745-
`custom_logo` text NOT NULL,
1744+
`default_logo` text NULL,
1745+
`custom_logo` text NULL,
17461746
PRIMARY KEY (`sysini_id`)
17471747
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
17481748

0 commit comments

Comments
 (0)