fix py test setup

Author: patrickwwbutler

misc/python/materialize/mzcompose/services/mysql.py

@@ -14,14 +14,16 @@
 )
 
 
-def create_mysql_server_args(server_id: str, is_master: bool) -> list[str]:
+def create_mysql_server_args(
+    server_id: str, is_master: bool, binlog_row_metadata: str = "full"
+) -> list[str]:
     args = [
         "--log-bin=mysql-bin",
         "--gtid_mode=ON",
         "--enforce_gtid_consistency=ON",
         "--binlog-format=row",
         "--binlog-row-image=full",
-        "--binlog-row-metadata=full",
+        f"--binlog-row-metadata={binlog_row_metadata}",
         f"--server-id={server_id}",
         "--max-connections=500",
     ]

test/mysql-cdc-old-syntax/mzcompose.py

@@ -31,7 +31,7 @@
     CockroachOrPostgresMetadata,
 )
 from materialize.mzcompose.services.minio import Minio
-from materialize.mzcompose.services.mysql import MySql
+from materialize.mzcompose.services.mysql import MySql, create_mysql_server_args
 from materialize.mzcompose.services.mz import Mz
 from materialize.mzcompose.services.test_certs import TestCerts
 from materialize.mzcompose.services.testdrive import Testdrive
@@ -42,21 +42,20 @@
 
 def create_mysql(mysql_version: str) -> MySql:
     return MySql(
-        version=mysql_version, additional_args=["--binlog_row_metadata=MINIMAL"]
+        version=mysql_version,
+        additional_args=create_mysql_server_args(
+            server_id="1", is_master=True, binlog_row_metadata="minimal"
+        ),
     )
 
 
 def create_mysql_replica(mysql_version: str) -> MySql:
     return MySql(
         name="mysql-replica",
         version=mysql_version,
-        additional_args=[
-            "--gtid_mode=ON",
-            "--enforce_gtid_consistency=ON",
-            "--skip-replica-start",
-            "--server-id=2",
-            "--binlog_row_metadata=MINIMAL",
-        ],
+        additional_args=create_mysql_server_args(
+            server_id="2", is_master=False, binlog_row_metadata="minimal"
+        ),
     )
 
 

test/mysql-cdc-resumption-old-syntax/mzcompose.py

@@ -198,12 +198,16 @@ def workflow_master_changes(c: Composition) -> None:
         MySql(
             name="mysql-replica-1",
             version=MySql.DEFAULT_VERSION,
-            additional_args=create_mysql_server_args(server_id="2", is_master=False),
+            additional_args=create_mysql_server_args(
+                server_id="2", is_master=False, binlog_row_metadata="minimal"
+            ),
         ),
         MySql(
             name="mysql-replica-2",
             version=MySql.DEFAULT_VERSION,
-            additional_args=create_mysql_server_args(server_id="3", is_master=False),
+            additional_args=create_mysql_server_args(
+                server_id="3", is_master=False, binlog_row_metadata="minimal"
+            ),
         ),
     ):
         initialize(c, create_source=False)
@@ -285,7 +289,9 @@ def workflow_switch_to_replica_and_kill_master(c: Composition) -> None:
         MySql(
             name="mysql-replica-1",
             version=MySql.DEFAULT_VERSION,
-            additional_args=create_mysql_server_args(server_id="2", is_master=False),
+            additional_args=create_mysql_server_args(
+                server_id="2", is_master=False, binlog_row_metadata="minimal"
+            ),
         ),
     ):
         initialize(c)