database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

cleanup: old_mode_deprecated

Browse Source 
make it easier to add more old-mode values
This commit is contained in:
Sergei Golubchik
2024-05-19 16:51:50 +02:00
parent fd3b7f5eba
commit 9ecec1f730
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.cc
View File

@@ -4183,7 +4183,7 @@ static int init_common_variables()
myf utf8_flag= global_system_variables.old_behavior & myf utf8_flag= global_system_variables.old_behavior &
OLD_MODE_UTF8_IS_UTF8MB3 ? MY_UTF8_IS_UTF8MB3 : 0; OLD_MODE_UTF8_IS_UTF8MB3 ? MY_UTF8_IS_UTF8MB3 : 0;
old_mode_deprecated_warnings(0, global_system_variables.old_behavior); old_mode_deprecated_warnings(global_system_variables.old_behavior);
if (character_set_collations_str[0]) if (character_set_collations_str[0])
{ {

2
sql/sql_class.h
View File

@@ -210,7 +210,7 @@ enum enum_binlog_row_image {
#define OLD_MODE_DEFAULT_VALUE OLD_MODE_UTF8_IS_UTF8MB3 #define OLD_MODE_DEFAULT_VALUE OLD_MODE_UTF8_IS_UTF8MB3
void old_mode_deprecated_warnings(THD *thd, ulonglong v); void old_mode_deprecated_warnings(ulonglong v);
extern char internal_table_name[2]; extern char internal_table_name[2];
extern char empty_c_string[1]; extern char empty_c_string[1];

33
sql/sys_vars.cc
View File

@@ -3947,34 +3947,33 @@ static Sys_var_set Sys_sql_mode(
static const char *old_mode_names[]= static const char *old_mode_names[]=
{ {
"NO_DUP_KEY_WARNINGS_WITH_IGNORE", // deprecated since 11.3 "NO_DUP_KEY_WARNINGS_WITH_IGNORE", // 0: deprecated since 11.3
"NO_PROGRESS_INFO", // deprecated since 11.3 "NO_PROGRESS_INFO", // 1: deprecated since 11.3
"ZERO_DATE_TIME_CAST", // deprecated since 11.3 "ZERO_DATE_TIME_CAST", // 2: deprecated since 11.3
"UTF8_IS_UTF8MB3", "UTF8_IS_UTF8MB3", // 3: on by default
"IGNORE_INDEX_ONLY_FOR_JOIN", // deprecated since 11.3 "IGNORE_INDEX_ONLY_FOR_JOIN", // 4: deprecated since 11.3
"COMPAT_5_1_CHECKSUM", // deprecated since 11.3 "COMPAT_5_1_CHECKSUM", // 5: deprecated since 11.3
"NO_NULL_COLLATION_IDS", // deprecated since 11.3 "NO_NULL_COLLATION_IDS", // 6: deprecated since 11.3
"LOCK_ALTER_TABLE_COPY", // deprecated since 11.3 "LOCK_ALTER_TABLE_COPY", // 7: deprecated since 11.3
0 0
}; };
void old_mode_deprecated_warnings(THD *thd, ulonglong v) void old_mode_deprecated_warnings(ulonglong v)
{ {
v &= ~OLD_MODE_DEFAULT_VALUE; v &= ~OLD_MODE_DEFAULT_VALUE;
for (uint i=0; old_mode_names[i]; i++) for (uint i=0; old_mode_names[i]; i++)
if ((1ULL<<i) & v) if ((1ULL<<i) & v)
{ sql_print_warning("--old-mode='%s' is deprecated and will be "
if (thd) "removed in a future release", old_mode_names[i]);
warn_deprecated<1103>(thd, old_mode_names[i]);
else
sql_print_warning("--old-mode='%s' is deprecated and will be "
"removed in a future release", old_mode_names[i]);
}
} }
static bool old_mode_deprecated(sys_var *self, THD *thd, set_var *var) static bool old_mode_deprecated(sys_var *self, THD *thd, set_var *var)
{ {
old_mode_deprecated_warnings(thd, var->save_result.ulonglong_value); ulonglong v= var->save_result.ulonglong_value & ~OLD_MODE_DEFAULT_VALUE;
uint i= 0;
for (; i <= 7; i++)
if ((1ULL<<i) & v)
warn_deprecated<1103>(thd, old_mode_names[i]);
return false; return false;
} }