MDEV-23570 deprecate keep_files_on_create

4 files changed, 129 insertions, 1 deletions

diff --git a/mysql-test/main/set_statement.result b/mysql-test/main/set_statement.result
index 53574fb4e4f..97cc4f3831a 100644
--- a/mysql-test/main/set_statement.result
+++ b/mysql-test/main/set_statement.result
@@ -132,6 +132,8 @@ sort_buffer_size	100000
 '#------------------ STATEMENT Test 6 -----------------------#'
 '# Initialize variables to known setting'
 SET SESSION  keep_files_on_create=ON;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Pre-STATEMENT variable value'
 SHOW SESSION VARIABLES LIKE 'keep_files_on_create';
@@ -142,6 +144,9 @@ SET STATEMENT keep_files_on_create=OFF FOR SELECT *,@@keep_files_on_create FROM
 v1	v2	@@keep_files_on_create
 1	2	0
 3	4	0
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT variable value'
 SHOW SESSION VARIABLES LIKE 'keep_files_on_create';
@@ -174,6 +179,8 @@ myisam_repair_threads=1,
 sort_buffer_size = 200000,
 max_join_size=2222220000000,
 keep_files_on_create=ON;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '#  LONG    '
 SHOW SESSION VARIABLES LIKE 'sort_buffer_size';
@@ -195,6 +202,9 @@ SET STATEMENT keep_files_on_create=OFF
 FOR SHOW SESSION VARIABLES LIKE 'keep_files_on_create';
 Variable_name	Value
 keep_files_on_create	OFF
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SHOW SESSION VARIABLES LIKE 'keep_files_on_create';
 Variable_name	Value
 keep_files_on_create	ON
@@ -231,6 +241,8 @@ sort_buffer_size=100000,
 binlog_format=mixed,
 keep_files_on_create=ON,
 max_join_size=2222220000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 ''
 '# Pre-STATEMENT variable value
@@ -263,6 +275,9 @@ max_join_size=4444440000000 FOR
 SELECT myProc(123.45);
 myProc(123.45)
 200006.17
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SET STATEMENT myisam_sort_buffer_size=400000,
 myisam_repair_threads=2,
 sort_buffer_size=300000,
@@ -272,6 +287,9 @@ max_join_size=4444440000000 FOR
 SELECT myProc(123.45);
 myProc(123.45)
 300006.17
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT No 1 variable value Pre-STATEMENT for No 2'
 SELECT @@myisam_sort_buffer_size,
@@ -290,6 +308,9 @@ binlog_format=row,
 keep_files_on_create=OFF,
 max_join_size=4444440000000 FOR
 DROP FUNCTION myProc;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT No 2 variable value
 SELECT @@myisam_sort_buffer_size,
@@ -309,6 +330,8 @@ sort_buffer_size=100000,
 binlog_format=mixed,
 keep_files_on_create=ON,
 max_join_size=2222220000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 ''
 '# Pre-STATEMENT variable value
@@ -329,6 +352,9 @@ keep_files_on_create=OFF,
 max_join_size=4444440000000 FOR
 PREPARE stmt1 FROM
 'SET STATEMENT binlog_format=row FOR SELECT *,@@binlog_format,@@sort_buffer_size FROM t1';
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 'Test No 1 Post Value & Test 2 Pre values'
 SELECT @@myisam_sort_buffer_size,
@@ -350,6 +376,9 @@ EXECUTE stmt1;
 v1	v2	@@binlog_format	@@sort_buffer_size
 1	2	ROW	200000
 3	4	ROW	200000
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT No 2
 SELECT @@myisam_sort_buffer_size,
@@ -370,6 +399,8 @@ sort_buffer_size=100000,
 binlog_format=mixed,
 keep_files_on_create=ON,
 max_join_size=2222220000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 ''
 '# Pre-STATEMENT variable value
@@ -397,6 +428,9 @@ SELECT @@myisam_sort_buffer_size,
 @@keep_files_on_create,
 @@max_join_size;
 END|
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 'Test No 1 Post Value & Test 2 Pre values'
 SELECT @@myisam_sort_buffer_size,
@@ -418,6 +452,9 @@ max_join_size=4444440000001 FOR
 CALL p1();
 @@myisam_sort_buffer_size	@@myisam_repair_threads	@@sort_buffer_size	@@binlog_format	@@keep_files_on_create	@@max_join_size
 400001	3	200001	ROW	0	4444440000001
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT No 2
 SELECT @@myisam_sort_buffer_size,
@@ -438,6 +475,8 @@ sort_buffer_size=100000,
 binlog_format=mixed,
 keep_files_on_create=ON,
 max_join_size=2222220000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 ''
 CREATE PROCEDURE p2() BEGIN
@@ -470,6 +509,11 @@ max_join_size=4444440000000 FOR
 CALL p2();
 @@myisam_sort_buffer_size	@@myisam_repair_threads	@@sort_buffer_size	@@binlog_format	@@keep_files_on_create	@@max_join_size
 400000	3	300000	MIXED	0	3333330000000
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT
 SELECT @@myisam_sort_buffer_size,
@@ -490,6 +534,8 @@ sort_buffer_size=100000,
 binlog_format=mixed,
 keep_files_on_create=ON,
 max_join_size=2222220000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 ''
 CREATE PROCEDURE p3() BEGIN
@@ -530,6 +576,13 @@ CALL p3();
 400000	2	200000	ROW	0	4444440000000
 @@myisam_sort_buffer_size	@@myisam_repair_threads	@@sort_buffer_size	@@binlog_format	@@keep_files_on_create	@@max_join_size
 400000	3	300000	MIXED	0	3333330000000
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT
 SELECT @@myisam_sort_buffer_size,
@@ -552,6 +605,8 @@ sort_buffer_size=100000,
 binlog_format=mixed,
 keep_files_on_create=ON,
 max_join_size=2222220000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 ''
 CREATE PROCEDURE p4() BEGIN
@@ -625,6 +680,11 @@ CALL p4();
 320000	2	220022	ROW	1	2222220000000
 @@myisam_sort_buffer_size	@@myisam_repair_threads	@@sort_buffer_size	@@binlog_format	@@keep_files_on_create	@@max_join_size
 320000	2	220022	ROW	1	2222220000000
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT
 SELECT @@myisam_sort_buffer_size,
@@ -768,6 +828,8 @@ sort_buffer_size=100000,
 binlog_format=mixed,
 keep_files_on_create=ON,
 max_join_size=2222220000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Pre-STATEMENT variable value
 SELECT @@myisam_sort_buffer_size,
@@ -793,6 +855,10 @@ sort_buffer_size=230013,
 binlog_format=row,
 keep_files_on_create=ON,
 max_join_size=2323230000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT
 SELECT @@myisam_sort_buffer_size,
@@ -813,6 +879,8 @@ sort_buffer_size=100000,
 binlog_format=mixed,
 keep_files_on_create=ON,
 max_join_size=2222220000000;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Pre-STATEMENT variable value
 SELECT @@myisam_sort_buffer_size,
@@ -859,6 +927,10 @@ CALL p5();
 400000	2	200000	ROW	0	4444440000000
 @@myisam_sort_buffer_size	@@myisam_repair_threads	@@sort_buffer_size	@@binlog_format	@@keep_files_on_create	@@max_join_size
 260000	3	230013	ROW	1	2323230000000
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 ''
 '# Post-STATEMENT
 SELECT @@myisam_sort_buffer_size,
@@ -970,6 +1042,8 @@ SELECT @@binlog_format;
 ROW
 SET @@binlog_format           = @save_binlog_format;
 SET @@keep_files_on_create    = @save_keep_files_on_create;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SET @@max_join_size           = @save_max_join_size;
 SET @@myisam_repair_threads   = @save_myisam_repair_threads;
 SET @@myisam_sort_buffer_size = @save_myisam_sort_buffer_size;
diff --git a/mysql-test/main/symlink.result b/mysql-test/main/symlink.result
index e8063ee736c..9388379af27 100644
--- a/mysql-test/main/symlink.result
+++ b/mysql-test/main/symlink.result
@@ -157,9 +157,13 @@ a
 drop table t1;
 End of 4.1 tests
 SET SESSION keep_files_on_create = TRUE;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 Got one of the listed errors
 SET SESSION keep_files_on_create = FALSE;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
index b7deea88a9c..26ecccab2ad 100644
--- a/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
+++ b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
@@ -8,23 +8,35 @@ SELECT @start_session_value;
 0
 '#--------------------FN_DYNVARS_054_01-------------------------#'
 SET @@global.keep_files_on_create = ON;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SET @@global.keep_files_on_create = DEFAULT;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
 0
 SET @@session.keep_files_on_create = ON;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SET @@session.keep_files_on_create = DEFAULT;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create;
 @@session.keep_files_on_create
 0
 '#--------------------FN_DYNVARS_054_02-------------------------#'
 SET @@global.keep_files_on_create = DEFAULT;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create = 'OFF';
 @@global.keep_files_on_create = 'OFF'
 1
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'OFF'
 SET @@session.keep_files_on_create = DEFAULT;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create = 'OFF';
 @@session.keep_files_on_create = 'OFF'
 1
@@ -32,51 +44,75 @@ Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'OFF'
 '#--------------------FN_DYNVARS_054_03-------------------------#'
 SET @@global.keep_files_on_create = ON;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
 1
 SET @@global.keep_files_on_create = OFF;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
 0
 SET @@global.keep_files_on_create = 0;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
 0
 SET @@global.keep_files_on_create = 1;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
 1
 SET @@global.keep_files_on_create = TRUE;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
 1
 SET @@global.keep_files_on_create = FALSE;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
 0
 '#--------------------FN_DYNVARS_054_04-------------------------#'
 SET @@session.keep_files_on_create = ON;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create;
 @@session.keep_files_on_create
 1
 SET @@session.keep_files_on_create = OFF;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create;
 @@session.keep_files_on_create
 0
 SET @@session.keep_files_on_create = 0;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create;
 @@session.keep_files_on_create
 0
 SET @@session.keep_files_on_create = 1;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create;
 @@session.keep_files_on_create
 1
 SET @@session.keep_files_on_create = TRUE;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create;
 @@session.keep_files_on_create
 1
 SET @@session.keep_files_on_create = FALSE;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create;
 @@session.keep_files_on_create
 0
@@ -130,12 +166,18 @@ IF(@@session.keep_files_on_create, "ON", "OFF") = VARIABLE_VALUE
 1
 '#---------------------FN_DYNVARS_001_08----------------------#'
 SET @@keep_files_on_create = OFF;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SET @@global.keep_files_on_create = ON;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@keep_files_on_create = @@global.keep_files_on_create;
 @@keep_files_on_create = @@global.keep_files_on_create
 0
 '#---------------------FN_DYNVARS_001_09----------------------#'
 SET @@keep_files_on_create = ON;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@keep_files_on_create = @@local.keep_files_on_create;
 @@keep_files_on_create = @@local.keep_files_on_create
 1
@@ -144,6 +186,8 @@ SELECT @@local.keep_files_on_create = @@session.keep_files_on_create;
 1
 '#---------------------FN_DYNVARS_001_10----------------------#'
 SET keep_files_on_create = 1;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@keep_files_on_create;
 @@keep_files_on_create
 1
@@ -154,10 +198,14 @@ ERROR 42S02: Unknown table 'session' in field list
 SELECT keep_files_on_create = @@session.keep_files_on_create;
 ERROR 42S22: Unknown column 'keep_files_on_create' in 'field list'
 SET @@global.keep_files_on_create = @start_global_value;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@global.keep_files_on_create;
 @@global.keep_files_on_create
 0
 SET @@session.keep_files_on_create = @start_session_value;
+Warnings:
+Warning	1287	'@@keep_files_on_create' is deprecated and will be removed in a future release
 SELECT @@session.keep_files_on_create;
 @@session.keep_files_on_create
 0
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 447c1f07310..7f2c34bae3e 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -4902,7 +4902,9 @@ static Sys_var_mybool Sys_keep_files_on_create(
        "keep_files_on_create",
        "Don't overwrite stale .MYD and .MYI even if no directory is specified",
        SESSION_VAR(keep_files_on_create), CMD_LINE(OPT_ARG),
-       DEFAULT(FALSE));
+       DEFAULT(FALSE),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
+       DEPRECATED("")); // since 10.8.0
 
 static char *license;
 static Sys_var_charptr Sys_license(