MDEV-13564: Replace innodb_unsafe_truncate with innodb_safe_truncate

Rename the 10.2-specific configuration option innodb_unsafe_truncate
to innodb_safe_truncate, and invert its value.

The default (for now) is innodb_safe_truncate=OFF, to avoid
disrupting users with an undo and redo log format change within
a Generally Available (GA) release series.

12 files changed, 25 insertions, 25 deletions

diff --git a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.opt b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.opt
index 20a4e60b8ec..9622465d71f 100644
--- a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.opt
+++ b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.opt
@@ -1 +1 @@
---skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb/t/alter_copy.opt b/mysql-test/suite/innodb/t/alter_copy.opt
index e76044be888..9622465d71f 100644
--- a/mysql-test/suite/innodb/t/alter_copy.opt
+++ b/mysql-test/suite/innodb/t/alter_copy.opt
@@ -1 +1 @@
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb/t/alter_crash.opt b/mysql-test/suite/innodb/t/alter_crash.opt
index 96710441921..0e92a05802e 100644
--- a/mysql-test/suite/innodb/t/alter_crash.opt
+++ b/mysql-test/suite/innodb/t/alter_crash.opt
@@ -1,2 +1,2 @@
 --loose-innodb-sys-tables
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb/t/drop_table_background.opt b/mysql-test/suite/innodb/t/drop_table_background.opt
index e76044be888..9622465d71f 100644
--- a/mysql-test/suite/innodb/t/drop_table_background.opt
+++ b/mysql-test/suite/innodb/t/drop_table_background.opt
@@ -1 +1 @@
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb/t/rename_table_debug.opt b/mysql-test/suite/innodb/t/rename_table_debug.opt
index e76044be888..9622465d71f 100644
--- a/mysql-test/suite/innodb/t/rename_table_debug.opt
+++ b/mysql-test/suite/innodb/t/rename_table_debug.opt
@@ -1 +1 @@
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb/t/truncate.opt b/mysql-test/suite/innodb/t/truncate.opt
index e76044be888..9622465d71f 100644
--- a/mysql-test/suite/innodb/t/truncate.opt
+++ b/mysql-test/suite/innodb/t/truncate.opt
@@ -1 +1 @@
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb/t/truncate_crash.opt b/mysql-test/suite/innodb/t/truncate_crash.opt
index e76044be888..9622465d71f 100644
--- a/mysql-test/suite/innodb/t/truncate_crash.opt
+++ b/mysql-test/suite/innodb/t/truncate_crash.opt
@@ -1 +1 @@
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb/t/truncate_foreign.opt b/mysql-test/suite/innodb/t/truncate_foreign.opt
index e76044be888..9622465d71f 100644
--- a/mysql-test/suite/innodb/t/truncate_foreign.opt
+++ b/mysql-test/suite/innodb/t/truncate_foreign.opt
@@ -1 +1 @@
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb/t/truncate_missing.opt b/mysql-test/suite/innodb/t/truncate_missing.opt
index e76044be888..9622465d71f 100644
--- a/mysql-test/suite/innodb/t/truncate_missing.opt
+++ b/mysql-test/suite/innodb/t/truncate_missing.opt
@@ -1 +1 @@
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/innodb_zip/t/restart.opt b/mysql-test/suite/innodb_zip/t/restart.opt
index fd89db6cc1d..8101a8573fc 100644
--- a/mysql-test/suite/innodb_zip/t/restart.opt
+++ b/mysql-test/suite/innodb_zip/t/restart.opt
@@ -1,4 +1,4 @@
 --loose-innodb-sys-tables
 --loose-innodb-sys-tablespaces
 --loose-innodb-sys-datafiles
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/mariabackup/truncate_during_backup.opt b/mysql-test/suite/mariabackup/truncate_during_backup.opt
index e76044be888..9622465d71f 100644
--- a/mysql-test/suite/mariabackup/truncate_during_backup.opt
+++ b/mysql-test/suite/mariabackup/truncate_during_backup.opt
@@ -1 +1 @@
---loose-skip-innodb-unsafe-truncate
+--loose-innodb-safe-truncate=1
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index 0673de0054a..a2b82df3dbc 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -2400,6 +2400,20 @@ NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
+VARIABLE_NAME	INNODB_SAFE_TRUNCATE
+SESSION_VALUE	NULL
+GLOBAL_VALUE	OFF
+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
+DEFAULT_VALUE	OFF
+VARIABLE_SCOPE	GLOBAL
+VARIABLE_TYPE	BOOLEAN
+VARIABLE_COMMENT	Use backup-safe TRUNCATE TABLE and crash-safe RENAME (incompatible with older MariaDB 10.2; OFF by default)
+NUMERIC_MIN_VALUE	NULL
+NUMERIC_MAX_VALUE	NULL
+NUMERIC_BLOCK_SIZE	NULL
+ENUM_VALUE_LIST	OFF,ON
+READ_ONLY	YES
+COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_SAVED_PAGE_NUMBER_DEBUG
 SESSION_VALUE	NULL
 GLOBAL_VALUE	0
@@ -2974,20 +2988,6 @@ NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	INNODB_UNSAFE_TRUNCATE
-SESSION_VALUE	NULL
-GLOBAL_VALUE	ON
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Use backup-unsafe TRUNCATE TABLE for compatibility with xtrabackup (on by default)
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	OFF,ON
-READ_ONLY	YES
-COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_USE_ATOMIC_WRITES
 SESSION_VALUE	NULL
 GLOBAL_VALUE	ON