Merge pull request #485 from cybozu-go/mysqlsh-8.0.30

Donwgrade mysqlsh to 8.0.30

Dockerfile

@@ -24,7 +24,7 @@ FROM quay.io/cybozu/mysql:8.0.31.1 as mysql
 FROM quay.io/cybozu/ubuntu:20.04
 LABEL org.opencontainers.image.source https://github.com/cybozu-go/moco
 
-ARG MYSQLSH_VERSION=8.0.31-1
+ARG MYSQLSH_VERSION=8.0.30-1
 
 COPY --from=builder /work/moco-backup /moco-backup
 

e2e/backup_test.go

@@ -59,7 +59,7 @@ var _ = Context("backup", func() {
  kubectlSafe(nil, "moco", "-n", "backup", "mysql", "-u", "moco-writable", "source", "--",
  "-e", "CREATE DATABASE test")
  kubectlSafe(nil, "moco", "-n", "backup", "mysql", "-u", "moco-writable", "source", "--",
- "-D", "test", "-e", "CREATE TABLE t (i INT PRIMARY KEY AUTO_INCREMENT, data TEXT NOT NULL) ENGINE=InnoDB")
+ "-D", "test", "-e", "CREATE TABLE t (id INT NOT NULL AUTO_INCREMENT, data VARCHAR(32) NOT NULL, PRIMARY KEY (id), KEY key1 (data), KEY key2 (data, id)) ENGINE=InnoDB")
  kubectlSafe(nil, "moco", "-n", "backup", "mysql", "-u", "moco-writable", "source", "--",
  "-D", "test", "--init_command=SET autocommit=1", "-e", "INSERT INTO t (data) VALUES ('aaa')")
  })