update to 3761a7f

ParadoxV5 · Jan 10, 2025 · 0d18516 · 0d18516
1 parent ec55fac
commit 0d18516
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/sql/item_vectorfunc.cc b/sql/item_vectorfunc.cc
@@ -74,7 +74,7 @@ String *Item_func_vec_totext::val_str_ascii(String *str)
     THD *thd= current_thd;
     push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
                         ER_VECTOR_BINARY_FORMAT_INVALID,
-                        ER_THD(thd, ER_VECTOR_BINARY_FORMAT_INVALID));
+                        "%s", ER_THD(thd, ER_VECTOR_BINARY_FORMAT_INVALID));
     null_value= true;
     return nullptr;
   }

diff --git a/storage/federatedx/federatedx_io_mysql.cc b/storage/federatedx/federatedx_io_mysql.cc
@@ -70,7 +70,7 @@ class federatedx_io_mysql :public federatedx_io
   federatedx_io_mysql(FEDERATEDX_SERVER *);
   ~federatedx_io_mysql() override;
 
-  // 1st arg is `federatedx_io_mysql* this`
+  // 1st arg is the implicit `this`
   int simple_query(const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 2, 3);
   int query(const char *buffer, size_t length) override;
   FEDERATEDX_IO_RESULT *store_result() override;

diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -21154,7 +21154,7 @@ dberr_t innodb_decryption_failed(THD *thd, dict_table_t *table)
   const int dblen= int(table->name.dblen());
   push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
                       HA_ERR_DECRYPTION_FAILED,
-                      "Table %`.*s.%`s in tablespace " UINT32PF
+                      "Table %.*sQ.%sQ in tablespace " UINT32PF
                       " (file %s) cannot be decrypted.",
                       dblen, table->name.m_name,
                       table->name.m_name + dblen + 1,
@@ -21176,7 +21176,7 @@ void innodb_fk_error(const trx_t *trx, dberr_t err, const char *name,
     (trx, &foreign, false);
   push_warning_printf(trx->mysql_thd, Sql_condition::WARN_LEVEL_WARN,
                       convert_error_code_to_mysql(err, 0, nullptr),
-                      "CREATE or ALTER TABLE %`.*s.%`s failed%s%.*s",
+                      "CREATE or ALTER TABLE %.*sQ.%sQ failed%s%.*s",
                       dblen, name, name + dblen + 1,
                       err == DB_DUPLICATE_KEY
                       ? ": duplicate name" : "",

diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
@@ -1200,7 +1200,7 @@ static dberr_t row_mysql_get_table_error(trx_t *trx, dict_table_t *table)
   }
 
   const int dblen= int(table->name.dblen());
-  sql_print_error("InnoDB .ibd file is missing for table %`.*s.%`s",
+  sql_print_error("InnoDB .ibd file is missing for table %.*sQ.%sQ",
                   dblen, table->name.m_name, table->name.m_name + dblen + 1);
   return DB_TABLESPACE_NOT_FOUND;
 }