--- rpms/smeserver-zabbix-server/contribs9/smeserver-zabbix-server-0.1-zabbix4.4.6.patch	2020/05/10 07:29:21	1.2
+++ rpms/smeserver-zabbix-server/contribs9/smeserver-zabbix-server-0.1-zabbix4.4.6.patch	2020/05/14 01:17:39	1.3
@@ -69,3 +69,33 @@ diff -Nur smeserver-zabbix-server-0.1.ol
      AllowOverride None
      Order allow,deny
      Allow from $access
+diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server
+--- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2020-05-13 12:16:30.203000000 -0400
++++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server	2020-05-13 21:13:00.912000000 -0400
+@@ -1,6 +1,6 @@
+ {
+-my $db = ${'zabbix-server'}{'DbName'} || 'zabbix';
+-my $user = ${'zabbix-server'}{'DbUser'} || 'zabbix';
++my $db = ${'zabbix-server'}{'DbName'} || 'zabbixdb';
++my $user = ${'zabbix-server'}{'DbUser'} || 'zabbixuser';
+ my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret';
+ 
+ my $schema = `rpm -qd zabbix-server-mysql | grep create`;
+@@ -9,7 +9,16 @@
+ $OUT .= <<"END";
+ #! /bin/sh
+ if [ -d /var/lib/mysql/$db ]; then
+-	for P in \$(rpm -qd zabbix-server | grep dbpatch | grep mysql); do
++
++	# check if utf8
++	my $curcharset=`echo 'show variables like "character_set_database";'|mysql $db|grep character_set_database|sed -r  's/^character_set_database\\s*([a-zA-Z0-9_-]+)/\\1/'`;
++	chomp $curcharset;
++	if ( $curcharset ne "utf8" ) {
++		echo "ALTER DATABASE DBNAME CHARACTER SET utf8 COLLATE utf8_bin;" |/usr/bin/mysql
++		echo 'ALTER TABLE `'.$db.'`.`problem_tag` DROP INDEX `problem_tag_1`, ADD INDEX `problem_tag_1` (`eventid`, `tag` (100), `value`(100));' |mysql
++ 		mysql --batch --skip-column-names --execute 'select concat("alter table ",TABLE_SCHEMA,".",TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") from information_schema.TABLES where TABLE_SCHEMA="'.$db.'"' |mysql
++	}
++	for P in \$(rpm -qd zabbix-server-mysql | grep dbpatch | grep mysql); do
+ 		/usr/bin/mysql $db < \$P
+ 	done
+ else