Skip to content
/ server Public

Commit 2c018f5

Browse files
HNOONa-0HNOONa-0
committed
MDEV-35369 Add deprecation columns to i_s.system_variables
Adds columns: * IS_DEPRECATED, as a boolean if the value is deprecated * DEPRECATED_REPLACEMENT, as how the server replaces this variableMDEV-35369 Add deprecation columns to system_variables
1 parent d755574 commit 2c018f5

File tree

12 files changed

+349
-15
lines changed

12 files changed

+349
-15
lines changed

‎mysql-test/main/repair.result‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ ENUM_VALUE_LIST DEFAULT,COPY,INPLACE,NOCOPY,INSTANT
305305
READ_ONLY NO
306306
COMMAND_LINE_ARGUMENT OPTIONAL
307307
GLOBAL_VALUE_PATH NULL
308+
IS_DEPRECATED YES
309+
DEPRECATED_REPLACEMENT NULL
308310
set alter_algorithm=COPY;
309311
Warnings:
310312
Warning 4200 The setting 'alter_algorithm' is ignored. It only exists for compatibility with old installations and will be removed in a future release

‎mysql-test/suite/funcs_1/r/is_columns_is.result‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,12 @@ def information_schema STATISTICS TABLE_NAME 3 NULL NO varchar 64 192 NULL NULL
482482
def information_schema STATISTICS TABLE_SCHEMA 2 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL NO NO
483483
def information_schema SYSTEM_VARIABLES COMMAND_LINE_ARGUMENT 14 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL NO NO
484484
def information_schema SYSTEM_VARIABLES DEFAULT_VALUE 5 NULL YES varchar 2048 6144 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(2048) select NEVER NULL NO NO
485+
def information_schema SYSTEM_VARIABLES DEPRECATED_REPLACEMENT 17 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL NO NO
485486
def information_schema SYSTEM_VARIABLES ENUM_VALUE_LIST 12 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8mb3 utf8mb3_general_ci longtext select NEVER NULL NO NO
486487
def information_schema SYSTEM_VARIABLES GLOBAL_VALUE 3 NULL YES varchar 2048 6144 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(2048) select NEVER NULL NO NO
487488
def information_schema SYSTEM_VARIABLES GLOBAL_VALUE_ORIGIN 4 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) select NEVER NULL NO NO
488489
def information_schema SYSTEM_VARIABLES GLOBAL_VALUE_PATH 15 NULL YES varchar 2048 6144 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(2048) select NEVER NULL NO NO
490+
def information_schema SYSTEM_VARIABLES IS_DEPRECATED 16 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) select NEVER NULL NO NO
489491
def information_schema SYSTEM_VARIABLES NUMERIC_BLOCK_SIZE 11 NULL YES varchar 21 63 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(21) select NEVER NULL NO NO
490492
def information_schema SYSTEM_VARIABLES NUMERIC_MAX_VALUE 10 NULL YES varchar 21 63 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(21) select NEVER NULL NO NO
491493
def information_schema SYSTEM_VARIABLES NUMERIC_MIN_VALUE 9 NULL YES varchar 21 63 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(21) select NEVER NULL NO NO
@@ -1182,6 +1184,8 @@ NULL information_schema STATISTICS SUB_PART bigint NULL NULL NULL NULL bigint(3)
11821184
3.0000 information_schema SYSTEM_VARIABLES READ_ONLY varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3)
11831185
3.0000 information_schema SYSTEM_VARIABLES COMMAND_LINE_ARGUMENT varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64)
11841186
3.0000 information_schema SYSTEM_VARIABLES GLOBAL_VALUE_PATH varchar 2048 6144 utf8mb3 utf8mb3_general_ci varchar(2048)
1187+
NULL information_schema SYSTEM_VARIABLES IS_DEPRECATED varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3)
1188+
3.0000 information_schema SYSTEM_VARIABLES DEPRECATED_REPLACEMENT varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64)
11851189
3.0000 information_schema TABLES TABLE_CATALOG varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512)
11861190
3.0000 information_schema TABLES TABLE_SCHEMA varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64)
11871191
3.0000 information_schema TABLES TABLE_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64)

‎mysql-test/suite/funcs_1/r/is_columns_is_embedded.result‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,10 +415,12 @@ def information_schema STATISTICS TABLE_NAME 3 NULL NO varchar 64 192 NULL NULL
415415
def information_schema STATISTICS TABLE_SCHEMA 2 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL NO NO
416416
def information_schema SYSTEM_VARIABLES COMMAND_LINE_ARGUMENT 14 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL NO NO
417417
def information_schema SYSTEM_VARIABLES DEFAULT_VALUE 5 NULL YES varchar 2048 6144 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(2048) NEVER NULL NO NO
418+
def information_schema SYSTEM_VARIABLES DEPRECATED_REPLACEMENT 17 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL NO NO
418419
def information_schema SYSTEM_VARIABLES ENUM_VALUE_LIST 12 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8mb3 utf8mb3_general_ci longtext NEVER NULL NO NO
419420
def information_schema SYSTEM_VARIABLES GLOBAL_VALUE 3 NULL YES varchar 2048 6144 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(2048) NEVER NULL NO NO
420421
def information_schema SYSTEM_VARIABLES GLOBAL_VALUE_ORIGIN 4 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(64) NEVER NULL NO NO
421422
def information_schema SYSTEM_VARIABLES GLOBAL_VALUE_PATH 15 NULL YES varchar 2048 6144 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(2048) NEVER NULL NO NO
423+
def information_schema SYSTEM_VARIABLES IS_DEPRECATED 16 NULL NO varchar 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(3) NEVER NULL NO NO
422424
def information_schema SYSTEM_VARIABLES NUMERIC_BLOCK_SIZE 11 NULL YES varchar 21 63 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(21) NEVER NULL NO NO
423425
def information_schema SYSTEM_VARIABLES NUMERIC_MAX_VALUE 10 NULL YES varchar 21 63 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(21) NEVER NULL NO NO
424426
def information_schema SYSTEM_VARIABLES NUMERIC_MIN_VALUE 9 NULL YES varchar 21 63 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(21) NEVER NULL NO NO
@@ -1047,6 +1049,8 @@ NULL information_schema STATISTICS SUB_PART bigint NULL NULL NULL NULL bigint(3)
10471049
3.0000 information_schema SYSTEM_VARIABLES READ_ONLY varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3)
10481050
3.0000 information_schema SYSTEM_VARIABLES COMMAND_LINE_ARGUMENT varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64)
10491051
3.0000 information_schema SYSTEM_VARIABLES GLOBAL_VALUE_PATH varchar 2048 6144 utf8mb3 utf8mb3_general_ci varchar(2048)
1052+
NULL information_schema SYSTEM_VARIABLES IS_DEPRECATED varchar 3 9 utf8mb3 utf8mb3_general_ci varchar(3)
1053+
3.0000 information_schema SYSTEM_VARIABLES DEPRECATED_REPLACEMENT varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64)
10501054
3.0000 information_schema TABLES TABLE_CATALOG varchar 512 1536 utf8mb3 utf8mb3_general_ci varchar(512)
10511055
3.0000 information_schema TABLES TABLE_SCHEMA varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64)
10521056
3.0000 information_schema TABLES TABLE_NAME varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(64)

‎mysql-test/suite/plugins/r/simple_password_check.result‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ ENUM_VALUE_LIST NULL
2929
READ_ONLY NO
3030
COMMAND_LINE_ARGUMENT REQUIRED
3131
GLOBAL_VALUE_PATH NULL
32+
IS_DEPRECATED NO
33+
DEPRECATED_REPLACEMENT NULL
3234
VARIABLE_NAME SIMPLE_PASSWORD_CHECK_LETTERS_SAME_CASE
3335
SESSION_VALUE NULL
3436
GLOBAL_VALUE 1
@@ -44,6 +46,8 @@ ENUM_VALUE_LIST NULL
4446
READ_ONLY NO
4547
COMMAND_LINE_ARGUMENT REQUIRED
4648
GLOBAL_VALUE_PATH NULL
49+
IS_DEPRECATED NO
50+
DEPRECATED_REPLACEMENT NULL
4751
VARIABLE_NAME SIMPLE_PASSWORD_CHECK_MINIMAL_LENGTH
4852
SESSION_VALUE NULL
4953
GLOBAL_VALUE 8
@@ -59,6 +63,8 @@ ENUM_VALUE_LIST NULL
5963
READ_ONLY NO
6064
COMMAND_LINE_ARGUMENT REQUIRED
6165
GLOBAL_VALUE_PATH NULL
66+
IS_DEPRECATED NO
67+
DEPRECATED_REPLACEMENT NULL
6268
VARIABLE_NAME SIMPLE_PASSWORD_CHECK_OTHER_CHARACTERS
6369
SESSION_VALUE NULL
6470
GLOBAL_VALUE 1
@@ -74,6 +80,8 @@ ENUM_VALUE_LIST NULL
7480
READ_ONLY NO
7581
COMMAND_LINE_ARGUMENT REQUIRED
7682
GLOBAL_VALUE_PATH NULL
83+
IS_DEPRECATED NO
84+
DEPRECATED_REPLACEMENT NULL
7785
create user foo1 identified by 'pwd';
7886
ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
7987
show warnings;

‎mysql-test/suite/sys_vars/r/sysvars_debug.result‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ENUM_VALUE_LIST NULL
1616
READ_ONLY NO
1717
COMMAND_LINE_ARGUMENT OPTIONAL
1818
GLOBAL_VALUE_PATH NULL
19+
IS_DEPRECATED NO
20+
DEPRECATED_REPLACEMENT NULL
1921
VARIABLE_NAME DEBUG_BINLOG_FSYNC_SLEEP
2022
SESSION_VALUE NULL
2123
GLOBAL_VALUE 314
@@ -31,6 +33,8 @@ ENUM_VALUE_LIST NULL
3133
READ_ONLY NO
3234
COMMAND_LINE_ARGUMENT REQUIRED
3335
GLOBAL_VALUE_PATH NULL
36+
IS_DEPRECATED NO
37+
DEPRECATED_REPLACEMENT NULL
3438
VARIABLE_NAME DEBUG_DBUG
3539
SESSION_VALUE
3640
GLOBAL_VALUE
@@ -46,6 +50,8 @@ ENUM_VALUE_LIST NULL
4650
READ_ONLY NO
4751
COMMAND_LINE_ARGUMENT OPTIONAL
4852
GLOBAL_VALUE_PATH NULL
53+
IS_DEPRECATED NO
54+
DEPRECATED_REPLACEMENT NULL
4955
VARIABLE_NAME DEBUG_MUTEX_DEADLOCK_DETECTOR
5056
SESSION_VALUE NULL
5157
GLOBAL_VALUE ON
@@ -61,6 +67,8 @@ ENUM_VALUE_LIST OFF,ON
6167
READ_ONLY YES
6268
COMMAND_LINE_ARGUMENT OPTIONAL
6369
GLOBAL_VALUE_PATH NULL
70+
IS_DEPRECATED NO
71+
DEPRECATED_REPLACEMENT NULL
6472
VARIABLE_NAME DEBUG_SYNC
6573
SESSION_VALUE ON - current signals: ''
6674
GLOBAL_VALUE NULL
@@ -76,3 +84,5 @@ ENUM_VALUE_LIST NULL
7684
READ_ONLY NO
7785
COMMAND_LINE_ARGUMENT NULL
7886
GLOBAL_VALUE_PATH NULL
87+
IS_DEPRECATED NO
88+
DEPRECATED_REPLACEMENT NULL

‎mysql-test/suite/sys_vars/r/sysvars_star.result‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ ENUM_VALUE_LIST NULL
2626
READ_ONLY NO
2727
COMMAND_LINE_ARGUMENT REQUIRED
2828
GLOBAL_VALUE_PATH NULL
29+
IS_DEPRECATED NO
30+
DEPRECATED_REPLACEMENT NULL
2931
VARIABLE_NAME COMPLETION_TYPE
3032
SESSION_VALUE CHAIN
3133
GLOBAL_VALUE NO_CHAIN
@@ -41,6 +43,8 @@ ENUM_VALUE_LIST NO_CHAIN,CHAIN,RELEASE
4143
READ_ONLY NO
4244
COMMAND_LINE_ARGUMENT REQUIRED
4345
GLOBAL_VALUE_PATH NULL
46+
IS_DEPRECATED NO
47+
DEPRECATED_REPLACEMENT NULL
4448
VARIABLE_NAME LOW_PRIORITY_UPDATES
4549
SESSION_VALUE OFF
4650
GLOBAL_VALUE ON
@@ -56,6 +60,8 @@ ENUM_VALUE_LIST OFF,ON
5660
READ_ONLY NO
5761
COMMAND_LINE_ARGUMENT OPTIONAL
5862
GLOBAL_VALUE_PATH NULL
63+
IS_DEPRECATED NO
64+
DEPRECATED_REPLACEMENT NULL
5965
VARIABLE_NAME PLUGIN_MATURITY
6066
SESSION_VALUE NULL
6167
GLOBAL_VALUE alpha
@@ -71,6 +77,8 @@ ENUM_VALUE_LIST unknown,experimental,alpha,beta,gamma,stable
7177
READ_ONLY YES
7278
COMMAND_LINE_ARGUMENT REQUIRED
7379
GLOBAL_VALUE_PATH var/my.cnf
80+
IS_DEPRECATED NO
81+
DEPRECATED_REPLACEMENT NULL
7482
VARIABLE_NAME SQL_ERROR_LOG_RATE
7583
SESSION_VALUE NULL
7684
GLOBAL_VALUE 100
@@ -86,6 +94,8 @@ ENUM_VALUE_LIST NULL
8694
READ_ONLY NO
8795
COMMAND_LINE_ARGUMENT REQUIRED
8896
GLOBAL_VALUE_PATH NULL
97+
IS_DEPRECATED NO
98+
DEPRECATED_REPLACEMENT NULL
8999
VARIABLE_NAME SQL_ERROR_LOG_ROTATIONS
90100
SESSION_VALUE NULL
91101
GLOBAL_VALUE 5
@@ -101,6 +111,8 @@ ENUM_VALUE_LIST NULL
101111
READ_ONLY YES
102112
COMMAND_LINE_ARGUMENT REQUIRED
103113
GLOBAL_VALUE_PATH var/my.cnf
114+
IS_DEPRECATED NO
115+
DEPRECATED_REPLACEMENT NULL
104116
create user foo@localhost;
105117
connect foo,localhost,foo;
106118
select global_value_path from information_schema.system_variables where variable_name='plugin_maturity';

0 commit comments

Comments
 (0)