galera mtr tests: post-merge correction for variables_debug.result

sysprg · sysprg · commit ee204ee644ac · 2025-08-14T04:17:56.000+02:00
diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result
@@ -140,11 +140,7 @@ WSREP_SST_DONOR_REJECTS_QUERIES
 WSREP_SST_METHOD
 WSREP_SST_RECEIVE_ADDRESS
 WSREP_START_POSITION
-<<<<<<< HEAD
 WSREP_STATUS_FILE
-=======
-WSREP_STRICT_DDL
->>>>>>> bb-10.6-serg
 WSREP_SYNC_WAIT
 WSREP_TRX_FRAGMENT_SIZE
 WSREP_TRX_FRAGMENT_UNIT
