Add and clause to check the dbtype
merge
Change zabbix version