Close tables using tc_purge to fix the "table marked as crashed" warning

Author: mariadb-andrzejjarzabek

mysql-test/main/backup_server_restore.result

@@ -21,10 +21,6 @@ i
 2
 3
 5
-Warnings:
-Error	145	Got error '145 "Table was marked as crashed and should be repaired"' for './test/tariant'
-Warning	1034	1 client is using or hasn't closed the table properly
-Note	1034	Table is fixed
 Restart database in original data directory 
 # restart
 Clean up

sql/sql_backup.cc

@@ -403,8 +403,18 @@ bool Sql_cmd_backup::execute(THD *thd)
   if (!fail)
   {
     fail= run_backup_proc_phase(thd, BACKUP_PROC_PHASE_BACKUP_LOCKED) ||
-          upgrade_and_process(thd, mdl_request, MDL_BACKUP_WAIT_DDL,
-                              BACKUP_PROC_PHASE_DDL_LOCKED) ||
+          thd->mdl_context.upgrade_shared_lock(mdl_request.ticket,
+                                               MDL_BACKUP_WAIT_DDL,
+                                               thd->variables.lock_wait_timeout);
+  }
+
+  if (!fail)
+  {
+    /* Note: this will need to be done on MDL_BACKUP_WAIT_FLUSH when we introduce
+    that phase */
+    tc_purge();
+    tdc_purge(true);
+    fail= run_backup_proc_phase(thd, BACKUP_PROC_PHASE_DDL_LOCKED) ||
           upgrade_and_process(thd, mdl_request, MDL_BACKUP_WAIT_COMMIT,
                               BACKUP_PROC_PHASE_COMMIT_LOCKED);
   }

storage/maria/ma_backup.cc

@@ -468,23 +468,7 @@ namespace
       data_path= index_path;
       index_path+= index_ext;
       data_path+= data_ext;
-      return flush_table_if_needed(index_path) ||
-             copy_file(index_path) || copy_file(data_path);
-    }
-
-    /* index_path is relative to datadir */
-    int flush_table_if_needed(const std::string& index_path)
-    {
-      /* Internally Aria identifies tables by fully resolved abolsute paths.
-      We need such path for the index file to be able to determine if the table
-      is open.*/
-      char canonical_path[FN_REFLEN];
-      fn_format(canonical_path, index_path.c_str(), "", "", MY_RETURN_REAL_PATH);
-      MARIA_HA *info= _ma_test_if_reopen(canonical_path);
-      if (!info)
-        return 0; /* Table not open, nothing to be done */
-      return _ma_flush_table_files(info, MARIA_FLUSH_DATA | MARIA_FLUSH_INDEX,
-                                   FLUSH_KEEP, FLUSH_KEEP);
+      return copy_file(index_path) || copy_file(data_path);
     }
 
     int copy_control_file() noexcept