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

MDEV-7481 Replace max_long_data_size functionality with max_allowed_packet

Browse Source
This commit is contained in:
Sergei Golubchik
2019-09-17 20:11:04 +02:00
parent 12414cd9f2
commit 32efbaa19a
14 changed files with 3 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/mysqld.cc
View File

@@ -340,7 +340,6 @@ PSI_statement_info stmt_info_rpl;
/* the default log output is log tables */
static bool lower_case_table_names_used= 0;
static bool max_long_data_size_used= false;
static bool volatile select_thread_in_use, signal_thread_in_use;
static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
static my_bool opt_short_log_format= 0, opt_silent_startup= 0;
@@ -512,12 +511,6 @@ long opt_secure_timestamp;
uint default_password_lifetime;
my_bool disconnect_on_expired_password;
/*
Maximum length of parameter value which can be set through
mysql_send_long_data() call.
*/
ulong max_long_data_size;
bool max_user_connections_checking=0;
/**
Limit of the total number of prepared statements in the server.
@@ -8335,9 +8328,6 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
case OPT_PLUGIN_LOAD_ADD:
opt_plugin_load_list_ptr->push_back(new i_string(argument));
break;
case OPT_MAX_LONG_DATA_SIZE:
max_long_data_size_used= true;
break;
case OPT_PFS_INSTRUMENT:
{
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
@@ -8753,14 +8743,6 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
opt_readonly= read_only;
/*
If max_long_data_size is not specified explicitly use
value of max_allowed_packet.
*/
if (!max_long_data_size_used)
SYSVAR_AUTOSIZE(max_long_data_size,
global_system_variables.max_allowed_packet);
/* Remember if max_user_connections was 0 at startup */
max_user_connections_checking= global_system_variables.max_user_connections != 0;