WIP MDEV-39092, and back up non-InnoDB files

Author: dr-m

mysql-test/main/backup_server_restore.result

@@ -0,0 +1,41 @@
+Prepare database
+CREATE TABLE tinno (i INTEGER) ENGINE=InnoDB;
+INSERT INTO tinno VALUES (1), (2), (3), (4);
+CREATE TABLE tariatr (i INTEGER) ENGINE=Aria TRANSACTIONAL=1;
+INSERT INTO tariatr VALUES (2), (3), (5), (7);
+CREATE TABLE tariant (i INTEGER) ENGINE=Aria TRANSACTIONAL=0;
+INSERT INTO tariant VALUES (1), (1), (2), (3), (5);
+Back up the database
+BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+Restore the database
+# restart: --datadir=MYSQLTEST_VARDIR/some_directory
+Check contents after restore
+SELECT * FROM tinno;
+i
+1
+2
+3
+4
+SELECT * FROM tariatr;
+i
+2
+3
+5
+7
+SELECT * FROM tariant;
+i
+1
+1
+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
+DROP TABLE tinno;
+DROP TABLE tariatr;
+DROP TABLE tariant;

mysql-test/main/backup_server_restore.test

@@ -0,0 +1,38 @@
+--source include/not_windows.inc
+--source include/have_innodb.inc
+
+--echo Prepare database
+CREATE TABLE tinno (i INTEGER) ENGINE=InnoDB;
+INSERT INTO tinno VALUES (1), (2), (3), (4);
+CREATE TABLE tariatr (i INTEGER) ENGINE=Aria TRANSACTIONAL=1;
+INSERT INTO tariatr VALUES (2), (3), (5), (7);
+CREATE TABLE tariant (i INTEGER) ENGINE=Aria TRANSACTIONAL=0;
+INSERT INTO tariant VALUES (1), (1), (2), (3), (5);
+
+--echo Back up the database
+evalp BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+
+--echo Restore the database
+--disable_query_log
+call mtr.add_suppression("InnoDB: Did not find any checkpoint after LSN=");
+call mtr.add_suppression("InnoDB: Renaming ib_[0-9]+.log to ib_logfile0");
+call mtr.add_suppression("mariadbd: Got error '145 \"Table was marked as crashed and should be repaired\"' for ");
+call mtr.add_suppression("Checking table: ");
+--enable_query_log
+--let $restart_parameters=--datadir=$MYSQLTEST_VARDIR/some_directory
+--source include/restart_mysqld.inc
+
+--echo Check contents after restore
+SELECT * FROM tinno;
+SELECT * FROM tariatr;
+SELECT * FROM tariant;
+
+--echo Restart database in original data directory 
+--let $restart_parameters=
+--source include/restart_mysqld.inc
+
+--echo Clean up
+DROP TABLE tinno;
+DROP TABLE tariatr;
+DROP TABLE tariant;
+--rmdir $MYSQLTEST_VARDIR/some_directory

mysql-test/suite/backup/backup_innodb,debug.rdiff

@@ -5,7 +5,7 @@
  DELETE FROM t;
  connect backup,localhost,root;
 +SET DEBUG_SYNC='innodb_backup_start SIGNAL start WAIT_FOR resume';
- BACKUP SERVER TO 'MYSQLTEST_VARDIR/some_directory';
+ BACKUP SERVER TO 'target_directory';
 +connection default;
 +SET DEBUG_SYNC='now WAIT_FOR start';
 +INSERT INTO t(a) SELECT * FROM seq_1_to_30000;

mysql-test/suite/backup/backup_innodb.result

@@ -2,23 +2,29 @@ CREATE TABLE t(a INT PRIMARY KEY, b CHAR(255) DEFAULT '' NOT NULL, INDEX(b))
 ENGINE=INNODB;
 BEGIN;
 INSERT INTO t SET a=1;
-BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+BACKUP SERVER TO '$target_directory';
 ROLLBACK;
 SELECT * FROM t;
 a	b
 1	
 BEGIN;
 DELETE FROM t;
 connect backup,localhost,root;
-BACKUP SERVER TO 'MYSQLTEST_VARDIR/some_directory';
+BACKUP SERVER TO 'target_directory';
 disconnect backup;
 connection default;
 ROLLBACK;
 SELECT * FROM t;
 a	b
 1	
-# restart
+DELETE FROM t;
+# restart: --defaults-file=MYSQLTEST_VARDIR/some_directory/backup.cnf --datadir=MYSQLTEST_VARDIR/some_directory
 SELECT * FROM t;
 a	b
 1	
+DELETE FROM t;
+ERROR HY000: Table 't' is read only
+# restart
+SELECT * FROM t;
+a	b
 DROP TABLE t;

mysql-test/suite/backup/backup_innodb.test

@@ -7,8 +7,17 @@ ENGINE=INNODB;
 BEGIN;
 INSERT INTO t SET a=1;
 
-evalp BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
---rmdir $MYSQLTEST_VARDIR/some_directory
+--let $target_directory=/tmp/some_directory$MTR_COMBINATION_ARCHIVED
+# comment out the following line (and some more, including rmdir),
+# to test cross-filesystem copy
+--let $target_directory=$MYSQLTEST_VARDIR/some_directory
+
+# Clean up after a previous failed test, in case we are retrying.
+--error 0,1
+--rmdir $target_directory
+
+evalp BACKUP SERVER TO '$target_directory';
+--rmdir $target_directory
 ROLLBACK;
 # BACKUP SERVER will implicitly commit the current transaction
 SELECT * FROM t;
@@ -19,31 +28,50 @@ DELETE FROM t;
 --connect backup,localhost,root
 if ($have_debug) {
 SET DEBUG_SYNC='innodb_backup_start SIGNAL start WAIT_FOR resume';
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-send_eval BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+--replace_result $target_directory target_directory
+send_eval BACKUP SERVER TO '$target_directory';
 --connection default
 SET DEBUG_SYNC='now WAIT_FOR start';
 INSERT INTO t(a) SELECT * FROM seq_1_to_30000;
 SET DEBUG_SYNC='now SIGNAL resume';
 --connection backup
+# FIXME: outside PMEM we may get ER_ERROR_ON_RENAME
 --reap
 }
 if (!$have_debug) {
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval BACKUP SERVER TO '$MYSQLTEST_VARDIR/some_directory';
+--replace_result $target_directory target_directory
+eval BACKUP SERVER TO '$target_directory';
 }
 
 --disconnect backup
 --connection default
 ROLLBACK;
 SELECT * FROM t;
+DELETE FROM t;
 
-let $datadir=`SELECT @@datadir`;
---source include/shutdown_mysqld.inc
-#--rmdir $datadir
-#--move_file $MYSQLTEST_VARDIR/some_directory $datadir
---rmdir $MYSQLTEST_VARDIR/some_directory
---source include/start_mysqld.inc
+if ($MARIADB_UPGRADE_EXE) {
+let target_directory=$target_directory;
+perl;
+open IN, "<", "$ENV{MYSQLTEST_VARDIR}/my.cnf";
+open OUT, ">>", "$ENV{target_directory}/backup.cnf";
+print OUT while (<IN>);
+close(IN);
+close(OUT);
+EOF
+}
+if (!$MARIADB_UPGRADE_EXE) {
+  --exec cat $MYSQLTEST_VARDIR/my.cnf >> $target_directory/backup.cnf
+}
+--let $restart_parameters=--defaults-file=$target_directory/backup.cnf --datadir=$target_directory
+--source include/restart_mysqld.inc
 
+SELECT * FROM t;
+# we must have started up with nonzero innodb_log_recovery_target
+--error ER_OPEN_AS_READONLY
+DELETE FROM t;
+--let $restart_parameters=
+--source include/restart_mysqld.inc
 SELECT * FROM t;
 DROP TABLE t;
+
+--rmdir $target_directory

storage/innobase/handler/backup_innodb.cc

@@ -594,7 +594,7 @@ class InnoDB_backup
   @param c         offset of the FILE_CHECKPOINT mini-transaction
   @return error code
   @retval 0 on success */
-  static int write_checkpoint(int dst, uint64_t c) noexcept
+  static int write_checkpoint(IF_WIN(HANDLE,int) dst, uint64_t c) noexcept
   {
 #ifdef _WIN32
     using tpool::pwrite;

storage/maria/CMakeLists.txt

@@ -45,6 +45,7 @@ SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c
             ha_maria.h maria_def.h ma_recovery_util.c ma_servicethread.c
             ma_norec.c
             ma_crypt.c ma_backup.c
+            ma_backup.cc ma_backup.h
 )
 
 IF(APPLE)

storage/maria/ha_maria.cc

@@ -23,6 +23,7 @@
 #include <myisampack.h>
 #include <my_bit.h>
 #include "ha_maria.h"
+#include "ma_backup.h"
 #include "trnman_public.h"
 #include "trnman.h"
 
@@ -3942,6 +3943,9 @@ static int ha_maria_init(void *p)
   maria_hton->prepare_for_backup= maria_prepare_for_backup;
   maria_hton->end_backup= maria_end_backup;
   maria_hton->update_optimizer_costs= aria_update_optimizer_costs;
+  maria_hton->backup_start= aria_backup_start;
+  maria_hton->backup_step= aria_backup_step;
+  maria_hton->backup_end= aria_backup_end;
 
   /* TODO: decide if we support Maria being used for log tables */
   maria_hton->flags= (HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES |