WIP MDEV-39092: back up some non-InnoDB files

Author: dr-m

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

@@ -1,6 +1,6 @@
 --- backup_innodb.result
 +++ backup_innodb,debug.result
-@@ -18,7 +18,13 @@
+@@ -22,7 +22,13 @@
  BEGIN;
  DELETE FROM t;
  connect backup,localhost,root;

mysql-test/suite/backup/backup_innodb.result

@@ -2,6 +2,10 @@ CREATE TABLE t(a INT PRIMARY KEY, b CHAR(255) DEFAULT '' NOT NULL, INDEX(b))
 ENGINE=INNODB;
 BEGIN;
 INSERT INTO t SET a=1;
+CREATE TABLE at1(i INTEGER) ENGINE=Aria TRANSACTIONAL=1;
+INSERT INTO at1 VALUES (2), (3), (5), (7);
+CREATE TABLE at0 (i INTEGER) ENGINE=Aria TRANSACTIONAL=0;
+INSERT INTO at0 VALUES (1), (1), (2), (3), (5);
 BACKUP SERVER TO '$target_directory';
 BACKUP SERVER TO '$target_directory' WITH '/bin/false';
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'WITH '/bin/false'' at line 1
@@ -25,8 +29,34 @@ ROLLBACK;
 SELECT * FROM t;
 a	b
 1	
-# restart
+DELETE FROM t;
+DROP TABLE at0, at1;
+# 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
+SELECT * FROM at0;
+i
+1
+1
+2
+3
+5
+SELECT * FROM at1;
+i
+2
+3
+5
+7
+DROP TABLE t, at0, at1;
+ERROR HY000: Table 't' is read only
+SELECT * FROM at0;
+ERROR 42S02: Table 'test.at0' doesn't exist
+SELECT * FROM at1;
+ERROR 42S02: Table 'test.at1' doesn't exist
+# restart
+SELECT * FROM t;
+a	b
 DROP TABLE t;

mysql-test/suite/backup/backup_innodb.test

@@ -7,6 +7,11 @@ ENGINE=INNODB;
 BEGIN;
 INSERT INTO t SET a=1;
 
+CREATE TABLE at1(i INTEGER) ENGINE=Aria TRANSACTIONAL=1;
+INSERT INTO at1 VALUES (2), (3), (5), (7);
+CREATE TABLE at0 (i INTEGER) ENGINE=Aria TRANSACTIONAL=0;
+INSERT INTO at0 VALUES (1), (1), (2), (3), (5);
+
 --let $target_directory=/tmp/some_directory$MTR_COMBINATION_ARCHIVED
 # comment out the following line (and replace all "rmdir" with "exec rm -fr")
 # to test cross-filesystem copy
@@ -57,13 +62,42 @@ eval BACKUP SERVER TO '$target_directory' 4 CONCURRENT;
 --connection default
 ROLLBACK;
 SELECT * FROM t;
+DELETE FROM t;
+DROP TABLE at0, at1;
 
-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;
+# A nonzero innodb_log_recovery_target makes InnoDB read-only.
+--error ER_OPEN_AS_READONLY
+DELETE FROM t;
+# Non-InnoDB tables are read-write.
+SELECT * FROM at0;
+SELECT * FROM at1;
+--error ER_OPEN_AS_READONLY
+DROP TABLE t, at0, at1;
+--error ER_NO_SUCH_TABLE
+SELECT * FROM at0;
+--error ER_NO_SUCH_TABLE
+SELECT * FROM at1;
+
+--let $restart_parameters=
+--source include/restart_mysqld.inc
 SELECT * FROM t;
 DROP TABLE t;
+
+--rmdir $target_directory

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 |