Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

648540858

2022-06-27 26739237e2d93460eb869067a6004bfa63a1bdb8

 sql/mysql.sql

@@ -471,6 +471,7 @@
                               `createStamp` bigint(20) DEFAULT NULL,
                               `aliveSecond` int(11) DEFAULT NULL,
                               `mediaServerId` varchar(50) DEFAULT NULL,
                               `serverId` varchar(50) not NULL,
                               PRIMARY KEY (`id`),
                               UNIQUE KEY `stream_push_pk` (`app`,`stream`)
) ENGINE=InnoDB AUTO_INCREMENT=300838 DEFAULT CHARSET=utf8mb4;