Bug#35115601 InnoDB - Page [...] still fixed or dirty crash during shutdown

Enable backporting to 8.0 by moving previous error message from 8.1
section to 8.0 section. Relax few checks on number of fixed pages

Change-Id: I5de03de2bb0c9d7ce37dbb45e65b22b084e757ac

Author: ram1048

mysql-test/suite/innodb/t/builder_insert_direct_freed.test

@@ -6,7 +6,7 @@ CREATE TABLE t1 (c1 INT);
 
 --echo # Create big enough table to ensure another call to Builder::insert_direct
 --disable_query_log
-call mtr.add_suppression("\\[ERROR\\] .* DDL Failed as Builder is already freed");
+call mtr.add_suppression("\\[ERROR\\] .* DDL failed as Builder is already freed");
 DELIMITER |;
 CREATE PROCEDURE populate_t1(IN BASE INT, IN SIZE INT)
 BEGIN

share/messages_to_error_log.txt

@@ -12280,7 +12280,7 @@ ER_WARN_DEPRECATED_OR_BLOCKED_CIPHER
    eng "Value for option '%s' contains cipher '%s' that is either blocked or deprecated (and will be removed in a future release). Please refer to the documentation for more details."
 
 ER_IB_MSG_DDL_FAIL_NO_BUILDER
-  eng "DDL Failed as Builder is already freed"
+  eng "DDL failed as Builder is already freed. Builder: state=%u, error_state=%u. Index: id=%zu, name='%s', space_id=%u, page=%u. Table: old_name='%s', new_name='%s'."
 
 # DO NOT add server-to-client messages here;
 # they go in messages_to_clients.txt

storage/innobase/btr/btr0load.cc

@@ -85,7 +85,7 @@ class Page_load : private ut::Non_copyable {
 
   /** Destructor */
   ~Page_load() noexcept {
-    ut_a(m_n_blocks_buf_fixed == 0);
+    ut_ad(m_n_blocks_buf_fixed == 0);
     if (m_heap != nullptr) {
       /* mtr is allocated using heap. */
       if (m_mtr != nullptr) {
@@ -858,7 +858,7 @@ void Page_load::latch() noexcept {
 
   buf_block_buf_fix_dec(m_block);
   m_n_blocks_buf_fixed--;
-  ut_a(m_n_blocks_buf_fixed >= 0);
+  ut_ad(m_n_blocks_buf_fixed >= 0);
 
   /* The caller is going to use the m_block, so it needs to be buffer-fixed
   even after the decrement above. This works like this:

storage/innobase/ddl/ddl0builder.cc

@@ -1264,7 +1264,11 @@ dberr_t Builder::insert_direct(Cursor &cursor, size_t thread_id) noexcept {
                   { static_cast<void>(online_build_handle_error(DB_ERROR)); });
 
   if (m_btr_load == nullptr) {
-    ib::error(ER_IB_MSG_DDL_FAIL_NO_BUILDER);
+    auto ind = index();
+    ib::error(ER_IB_MSG_DDL_FAIL_NO_BUILDER, static_cast<unsigned>(get_state()),
+              static_cast<unsigned>(get_error()), id(), ind->name(),
+              ind->space_id(), static_cast<unsigned>(ind->page),
+              ctx().old_table()->name.m_name, ctx().new_table()->name.m_name);
     return DB_ERROR;
   }