修复MySQL事件回归测试前置条件并补充恢复运维要求
补齐触发器测试精确库授权中的事件权限,等待多语句事件完整执行及线程退出。补充事件备份、恢复维护权限、调度与官方客户端边界。 验证:MySQL 5.7/8.0 隔离实库专项全部通过;后端无缓存全量测试、go vet、依赖校验通过。本次不代表生产部署验收。
This commit is contained in:
1 parent
8cba0d5fd2
commit
3625e8b3d8
3 files changed
+20
-6
No files matched your search
@@ -103,16 +103,24 @@ func TestMySQLRealOfficialStoredPrograms(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
deadline := time.Now().Add(10 * time.Second)
|
||||
var value int
|
||||
var completed bool
|
||||
var workers int
|
||||
for time.Now().Before(deadline) {
|
||||
if err := verify.DB.QueryRowContext(t.Context(), "SELECT value FROM interop WHERE id = 1").Scan(&value); err != nil {
|
||||
if err := verify.DB.QueryRowContext(t.Context(), "SELECT value = 115 AND label = '事件;执行' FROM interop WHERE id = 1").Scan(&completed); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if value == 115 {
|
||||
// 多语句事件逐条提交,必须等待完整结果及工作线程退出,避免读取中间状态或影响下一用例。
|
||||
if err := server.Admin().QueryRowContext(t.Context(), "SELECT COUNT(*) FROM information_schema.PROCESSLIST WHERE COMMAND = 'Connect'").Scan(&workers); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if completed && workers == 0 {
|
||||
break
|
||||
}
|
||||
time.Sleep(25 * time.Millisecond)
|
||||
}
|
||||
if !completed || workers != 0 {
|
||||
t.Fatal("事件未在预期时间完成全部更新并退出工作线程")
|
||||
}
|
||||
checkMySQLInteropValue(t, target, "SELECT CONCAT(value, '|', label) FROM interop WHERE id = 1", "115|事件;执行")
|
||||
checkMySQLInteropValue(t, source, "SELECT CONCAT(value, '|', label) FROM interop WHERE id = 1", "10|原始值")
|
||||
})
|
||||
|
||||
@@ -153,7 +153,7 @@ func TestMySQLRealTriggerPrivileges(t *testing.T) {
|
||||
statements = append(statements, "GRANT TRIGGER ON "+schema+".* TO "+account)
|
||||
case "escaped_schema":
|
||||
escaped := strings.ReplaceAll(parsed.DBName, "_", string(rune(92))+"_")
|
||||
statements = append(statements, "GRANT SELECT, TRIGGER ON "+quoteMySQLIdentifier(escaped)+".* TO "+account)
|
||||
statements = append(statements, "GRANT SELECT, TRIGGER, EVENT ON "+quoteMySQLIdentifier(escaped)+".* TO "+account)
|
||||
case "shadowed_schema":
|
||||
statements = append(statements, "GRANT TRIGGER ON `scert%`.* TO "+account)
|
||||
case "shadowed_exact":
|
||||
|
||||
Reference in new issue
Block a user