From f1b68b9a19ab750b6ce74bf59436995ee2d9d390 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Mon, 30 Jun 2025 11:26:03 +0300 Subject: [PATCH] Fix merge error im the mysql-test/columnstore/include/syscatalog_mysql.sql --- mysql-test/columnstore/include/syscatalog_mysql.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-test/columnstore/include/syscatalog_mysql.sql b/mysql-test/columnstore/include/syscatalog_mysql.sql index 23470f666..aea3fdaad 100644 --- a/mysql-test/columnstore/include/syscatalog_mysql.sql +++ b/mysql-test/columnstore/include/syscatalog_mysql.sql @@ -1,6 +1,5 @@ --disable_query_log --disable_warnings --- SYSTABLE create database if not exists calpontsys;