From c3e04c90f8a6452e47fb9429a9c259acd75f9ded Mon Sep 17 00:00:00 2001 From: Axel Svensson Date: Mon, 7 Apr 2025 16:46:23 +0200 Subject: [PATCH] Fix warning 1296 --- .../suite/ndb/r/ndb_alter_table_temp_files_cleanup2.result | 2 +- mysql-test/suite/ndb/t/ndb_alter_table_temp_files_cleanup2.test | 2 +- storage/ndb/plugin/ha_ndbcluster.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/ndb/r/ndb_alter_table_temp_files_cleanup2.result b/mysql-test/suite/ndb/r/ndb_alter_table_temp_files_cleanup2.result index 08a9ba905057..e9290743bd35 100644 --- a/mysql-test/suite/ndb/r/ndb_alter_table_temp_files_cleanup2.result +++ b/mysql-test/suite/ndb/r/ndb_alter_table_temp_files_cleanup2.result @@ -18,7 +18,7 @@ count(*) 1 ALTER TABLE t1 ALGORITHM=COPY; Warnings: -Warning 1296 The temporary named table #sql-XXXX_X.test already exists, it will be removed +Warning 1296 The temporary named table test.#sql-XXXX_X already exists, it will be removed # verify that original data has not been affected SELECT a, b FROM t1 ORDER BY a; a b diff --git a/mysql-test/suite/ndb/t/ndb_alter_table_temp_files_cleanup2.test b/mysql-test/suite/ndb/t/ndb_alter_table_temp_files_cleanup2.test index f70aa1a5416c..3cfb62f5163c 100644 --- a/mysql-test/suite/ndb/t/ndb_alter_table_temp_files_cleanup2.test +++ b/mysql-test/suite/ndb/t/ndb_alter_table_temp_files_cleanup2.test @@ -35,7 +35,7 @@ ALTER TABLE t1 ALGORITHM=COPY; --echo # verify that the temporary named table has been left behind - required to reproduce the bug SELECT count(*) FROM ndbinfo.dict_obj_info WHERE REGEXP_LIKE(fq_name, '#sql'); ---replace_regex /sql-.*\./sql-XXXX_X\./ +--replace_regex /sql-[0-9a-f_]+ /sql-XXXX_X / ALTER TABLE t1 ALGORITHM=COPY; --echo # verify that original data has not been affected diff --git a/storage/ndb/plugin/ha_ndbcluster.cc b/storage/ndb/plugin/ha_ndbcluster.cc index 54ff3c7b0963..0d9e6a256734 100644 --- a/storage/ndb/plugin/ha_ndbcluster.cc +++ b/storage/ndb/plugin/ha_ndbcluster.cc @@ -9484,7 +9484,7 @@ int ha_ndbcluster::create(const char *path [[maybe_unused]], if (ndbtab != nullptr) { thd_ndb->push_warning( "The temporary named table %s.%s already exists, it will be removed", - tabname, dbname); + dbname, tabname); if (ndb->getDictionary()->dropTableGlobal(*ndbtab, flag) != 0) { thd_ndb->push_warning( "Attempt to drop temporary named table %s.%s failed", dbname,