database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.8 into 10.9

Browse Source
This commit is contained in:
Marko Mäkelä
2023-04-28 13:39:33 +03:00
parent d0a71e90b8 7d967423fe
commit d8997f875e
21 changed files with 211 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
client/client_priv.h
View File

@ -153,51 +153,3 @@ enum options_client
#else #else
#define SOCKET_PROTOCOL_TO_FORCE MYSQL_PROTOCOL_PIPE #define SOCKET_PROTOCOL_TO_FORCE MYSQL_PROTOCOL_PIPE
#endif #endif
/**
Utility function to implicitly change the connection protocol to a
consistent value given the command line arguments. Additionally,
warns the user that the protocol has been changed.
Arguments:
@param [in] host Name of the host to connect to
@param [in, out] opt_protocol Location of the protocol option
variable to update
@param [in] new_protocol New protocol to force
*/
static inline void warn_protocol_override(char *host,
uint *opt_protocol,
uint new_protocol)
{
DBUG_ASSERT(new_protocol == MYSQL_PROTOCOL_TCP
|| new_protocol == SOCKET_PROTOCOL_TO_FORCE);
if ((host == NULL
|| strncmp(host, LOCAL_HOST, sizeof(LOCAL_HOST)-1) == 0))
{
const char *protocol_name;
if (*opt_protocol == MYSQL_PROTOCOL_DEFAULT
#ifndef _WIN32
&& new_protocol == MYSQL_PROTOCOL_SOCKET
#else
&& new_protocol == MYSQL_PROTOCOL_TCP
#endif
)
{
/* This is already the default behavior, do nothing */
return;
}
protocol_name= sql_protocol_typelib.type_names[new_protocol-1];
fprintf(stderr, "%s %s %s\n",
"WARNING: Forcing protocol to ",
protocol_name,
" due to option specification. "
"Please explicitly state intended protocol.");
*opt_protocol = new_protocol;
}
}

64
client/mysql.cc
View File

@ -299,8 +299,6 @@ unsigned short terminal_width= 80;
static uint opt_protocol=0; static uint opt_protocol=0;
static const char *opt_protocol_type= ""; static const char *opt_protocol_type= "";
static uint protocol_to_force= MYSQL_PROTOCOL_DEFAULT;
#include "sslopt-vars.h" #include "sslopt-vars.h"
const char *default_dbug_option="d:t:o,/tmp/mariadb.trace"; const char *default_dbug_option="d:t:o,/tmp/mariadb.trace";
@ -1269,14 +1267,6 @@ int main(int argc,char *argv[])
exit(status.exit_status); exit(status.exit_status);
} }
/* Command line options override configured protocol */
if (protocol_to_force > MYSQL_PROTOCOL_DEFAULT
&& protocol_to_force != opt_protocol)
{
warn_protocol_override(current_host, &opt_protocol, protocol_to_force);
}
if (status.batch && !status.line_buff && if (status.batch && !status.line_buff &&
!(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin))) !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin)))
{ {
@ -1870,11 +1860,9 @@ static void usage(int version)
my_bool my_bool
get_one_option(const struct my_option *opt, const char *argument, const char *filename) get_one_option(const struct my_option *opt, const char *argument,
const char *filename)
{ {
/* Track when protocol is set via CLI to not force port TCP protocol override */
static my_bool ignore_protocol_override = FALSE;
switch(opt->id) { switch(opt->id) {
case OPT_CHARSETS_DIR: case OPT_CHARSETS_DIR:
strmake_buf(mysql_charsets_dir, argument); strmake_buf(mysql_charsets_dir, argument);
@ -1935,18 +1923,11 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
if (!argument[0]) if (!argument[0])
opt_protocol= 0; opt_protocol= 0;
else if ((opt_protocol= find_type_with_warning(argument, &sql_protocol_typelib, else if ((opt_protocol=
find_type_with_warning(argument, &sql_protocol_typelib,
opt->name)) <= 0) opt->name)) <= 0)
exit(1); exit(1);
#endif #endif
/* Specification of protocol via CLI trumps implicit overrides */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
case OPT_SERVER_ARG: case OPT_SERVER_ARG:
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
@ -2046,13 +2027,6 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi
#ifdef _WIN32 #ifdef _WIN32
opt_protocol = MYSQL_PROTOCOL_PIPE; opt_protocol = MYSQL_PROTOCOL_PIPE;
opt_protocol_type= "pipe"; opt_protocol_type= "pipe";
/* Prioritize pipe if explicit via command line */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
#endif #endif
break; break;
#include <sslopt-case.h> #include <sslopt-case.h>
@ -2065,35 +2039,17 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi
mysql_end(-1); mysql_end(-1);
break; break;
case 'P': case 'P':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == SOCKET_PROTOCOL_TO_FORCE)
{ {
ignore_protocol_override = TRUE; /* Port given on command line, switch protocol to use TCP */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_TCP;
}
/* If port is set via CLI, try to force protocol to TCP */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = MYSQL_PROTOCOL_TCP;
} }
break; break;
case 'S': case 'S':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == MYSQL_PROTOCOL_TCP)
{ {
ignore_protocol_override = TRUE; /* Socket given on command line, switch protocol to use SOCKETSt */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
/* Prioritize socket if set via command line */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = SOCKET_PROTOCOL_TO_FORCE;
} }
break; break;
case 'I': case 'I':

61
client/mysqladmin.cc
View File

@ -54,8 +54,6 @@ static bool sql_log_bin_off= false;
static uint opt_protocol=0; static uint opt_protocol=0;
static myf error_flags; /* flags to pass to my_printf_error, like ME_BELL */ static myf error_flags; /* flags to pass to my_printf_error, like ME_BELL */
static uint protocol_to_force= MYSQL_PROTOCOL_DEFAULT;
/* /*
When using extended-status relatively, ex_val_max_len is the estimated When using extended-status relatively, ex_val_max_len is the estimated
maximum length for any relative value printed by extended-status. The maximum length for any relative value printed by extended-status. The
@ -243,12 +241,9 @@ static const char *load_default_groups[]=
0 }; 0 };
my_bool my_bool
get_one_option(const struct my_option *opt, const char *argument, const char *filename) get_one_option(const struct my_option *opt, const char *argument,
const char *filename)
{ {
/* Track when protocol is set via CLI to not force overrides */
static my_bool ignore_protocol_override = FALSE;
switch(opt->id) { switch(opt->id) {
case 'c': case 'c':
opt_count_iterations= 1; opt_count_iterations= 1;
@ -280,13 +275,6 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi
case 'W': case 'W':
#ifdef _WIN32 #ifdef _WIN32
opt_protocol = MYSQL_PROTOCOL_PIPE; opt_protocol = MYSQL_PROTOCOL_PIPE;
/* Prioritize pipe if explicit via command line */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
#endif #endif
break; break;
case '#': case '#':
@ -322,45 +310,19 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi
sf_leaking_memory= 1; /* no memory leak reports here */ sf_leaking_memory= 1; /* no memory leak reports here */
exit(1); exit(1);
} }
/* Specification of protocol via CLI trumps implicit overrides */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
case 'P': case 'P':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == SOCKET_PROTOCOL_TO_FORCE)
{ {
ignore_protocol_override = TRUE; /* Port given on command line, switch protocol to use TCP */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_TCP;
}
/* If port is set via CLI, try to force protocol to TCP */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = MYSQL_PROTOCOL_TCP;
} }
break; break;
case 'S': case 'S':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == MYSQL_PROTOCOL_TCP)
{ {
ignore_protocol_override = TRUE; /* Socket given on command line, switch protocol to use SOCKETSt */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
/* Prioritize socket if set via command line */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = SOCKET_PROTOCOL_TO_FORCE;
} }
break; break;
} }
@ -388,13 +350,6 @@ int main(int argc,char *argv[])
temp_argv= mask_password(argc, &argv); temp_argv= mask_password(argc, &argv);
temp_argc= argc; temp_argc= argc;
/* Command line options override configured protocol */
if (protocol_to_force > MYSQL_PROTOCOL_DEFAULT
&& protocol_to_force != opt_protocol)
{
warn_protocol_override(host, &opt_protocol, protocol_to_force);
}
if (debug_info_flag) if (debug_info_flag)
my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO; my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO;
if (debug_check_flag) if (debug_check_flag)

53
client/mysqlbinlog.cc
View File

@ -99,8 +99,6 @@ static const char *output_prefix= "";
static char **defaults_argv= 0; static char **defaults_argv= 0;
static MEM_ROOT glob_root; static MEM_ROOT glob_root;
static uint protocol_to_force= MYSQL_PROTOCOL_DEFAULT;
#ifndef DBUG_OFF #ifndef DBUG_OFF
static const char *default_dbug_option = "d:t:o,/tmp/mariadb-binlog.trace"; static const char *default_dbug_option = "d:t:o,/tmp/mariadb-binlog.trace";
const char *current_dbug_option= default_dbug_option; const char *current_dbug_option= default_dbug_option;
@ -2309,13 +2307,11 @@ int parse_gtid_filter_option(
} }
extern "C" my_bool extern "C" my_bool
get_one_option(const struct my_option *opt, const char *argument, const char *filename) get_one_option(const struct my_option *opt, const char *argument,
const char *filename)
{ {
bool tty_password=0; bool tty_password=0;
/* Track when protocol is set via CLI to not force overrides */
static my_bool ignore_protocol_override = FALSE;
switch (opt->id) { switch (opt->id) {
#ifndef DBUG_OFF #ifndef DBUG_OFF
case '#': case '#':
@ -2365,14 +2361,6 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi
sf_leaking_memory= 1; /* no memory leak reports here */ sf_leaking_memory= 1; /* no memory leak reports here */
die(1); die(1);
} }
/* Specification of protocol via CLI trumps implicit overrides */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
#ifdef WHEN_FLASHBACK_REVIEW_READY #ifdef WHEN_FLASHBACK_REVIEW_READY
case opt_flashback_review: case opt_flashback_review:
@ -2450,35 +2438,17 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi
print_row_event_positions_used= 1; print_row_event_positions_used= 1;
break; break;
case 'P': case 'P':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == SOCKET_PROTOCOL_TO_FORCE)
{ {
ignore_protocol_override = TRUE; /* Port given on command line, switch protocol to use TCP */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_TCP;
}
/* If port is set via CLI, try to force protocol to TCP */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = MYSQL_PROTOCOL_TCP;
} }
break; break;
case 'S': case 'S':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == MYSQL_PROTOCOL_TCP)
{ {
ignore_protocol_override = TRUE; /* Socket given on command line, switch protocol to use SOCKETSt */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
/* Prioritize socket if set via command line */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = SOCKET_PROTOCOL_TO_FORCE;
} }
break; break;
case 'v': case 'v':
@ -3602,13 +3572,6 @@ int main(int argc, char** argv)
parse_args(&argc, (char***)&argv); parse_args(&argc, (char***)&argv);
/* Command line options override configured protocol */
if (protocol_to_force > MYSQL_PROTOCOL_DEFAULT
&& protocol_to_force != opt_protocol)
{
warn_protocol_override(host, &opt_protocol, protocol_to_force);
}
if (!argc || opt_version) if (!argc || opt_version)
{ {
if (!opt_version) if (!opt_version)

59
client/mysqlcheck.c
View File

@ -57,8 +57,6 @@ DYNAMIC_ARRAY tables4repair, tables4rebuild, alter_table_cmds;
DYNAMIC_ARRAY views4repair; DYNAMIC_ARRAY views4repair;
static uint opt_protocol=0; static uint opt_protocol=0;
static uint protocol_to_force= MYSQL_PROTOCOL_DEFAULT;
enum operations { DO_CHECK=1, DO_REPAIR, DO_ANALYZE, DO_OPTIMIZE, DO_FIX_NAMES }; enum operations { DO_CHECK=1, DO_REPAIR, DO_ANALYZE, DO_OPTIMIZE, DO_FIX_NAMES };
const char *operation_name[]= const char *operation_name[]=
{ {
@ -291,10 +289,6 @@ get_one_option(const struct my_option *opt,
const char *filename) const char *filename)
{ {
int orig_what_to_do= what_to_do; int orig_what_to_do= what_to_do;
/* Track when protocol is set via CLI to not force overrides */
static my_bool ignore_protocol_override = FALSE;
DBUG_ENTER("get_one_option"); DBUG_ENTER("get_one_option");
switch(opt->id) { switch(opt->id) {
@ -357,13 +351,6 @@ get_one_option(const struct my_option *opt,
case 'W': case 'W':
#ifdef _WIN32 #ifdef _WIN32
opt_protocol = MYSQL_PROTOCOL_PIPE; opt_protocol = MYSQL_PROTOCOL_PIPE;
/* Prioritize pipe if explicit via command line */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
#endif #endif
break; break;
case '#': case '#':
@ -387,45 +374,19 @@ get_one_option(const struct my_option *opt,
sf_leaking_memory= 1; /* no memory leak reports here */ sf_leaking_memory= 1; /* no memory leak reports here */
exit(1); exit(1);
} }
/* Specification of protocol via CLI trumps implicit overrides */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
case 'P': case 'P':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == SOCKET_PROTOCOL_TO_FORCE)
{ {
ignore_protocol_override = TRUE; /* Port given on command line, switch protocol to use TCP */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_TCP;
}
/* If port is set via CLI, try to force protocol to TCP */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = MYSQL_PROTOCOL_TCP;
} }
break; break;
case 'S': case 'S':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == MYSQL_PROTOCOL_TCP)
{ {
ignore_protocol_override = TRUE; /* Socket given on command line, switch protocol to use SOCKETSt */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
/* Prioritize socket if set via command line */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = SOCKET_PROTOCOL_TO_FORCE;
} }
break; break;
} }
@ -1249,14 +1210,6 @@ int main(int argc, char **argv)
if (get_options(&argc, &argv)) if (get_options(&argc, &argv))
goto end1; goto end1;
/* Command line options override configured protocol */
if (protocol_to_force > MYSQL_PROTOCOL_DEFAULT
&& protocol_to_force != opt_protocol)
{
warn_protocol_override(current_host, &opt_protocol, protocol_to_force);
}
sf_leaking_memory=0; /* from now on we cleanup properly */ sf_leaking_memory=0; /* from now on we cleanup properly */
ret= EX_MYSQLERR; ret= EX_MYSQLERR;

66
client/mysqldump.c
View File

@ -194,8 +194,6 @@ FILE *stderror_file=0;
static uint opt_protocol= 0; static uint opt_protocol= 0;
static char *opt_plugin_dir= 0, *opt_default_auth= 0; static char *opt_plugin_dir= 0, *opt_default_auth= 0;
static uint protocol_to_force= MYSQL_PROTOCOL_DEFAULT;
/* /*
Dynamic_string wrapper functions. In this file use these Dynamic_string wrapper functions. In this file use these
wrappers, they will terminate the process if there is wrappers, they will terminate the process if there is
@ -881,9 +879,6 @@ get_one_option(const struct my_option *opt,
const char *filename) const char *filename)
{ {
/* Track when protocol is set via CLI to not force overrides */
static my_bool ignore_protocol_override = FALSE;
switch (opt->id) { switch (opt->id) {
case 'p': case 'p':
if (argument == disabled_my_option) if (argument == disabled_my_option)
@ -914,13 +909,6 @@ get_one_option(const struct my_option *opt,
case 'W': case 'W':
#ifdef _WIN32 #ifdef _WIN32
opt_protocol= MYSQL_PROTOCOL_PIPE; opt_protocol= MYSQL_PROTOCOL_PIPE;
/* Prioritize pipe if explicit via command line */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
#endif #endif
break; break;
case 'N': case 'N':
@ -1071,49 +1059,23 @@ get_one_option(const struct my_option *opt,
sf_leaking_memory= 1; /* no memory leak reports here */ sf_leaking_memory= 1; /* no memory leak reports here */
exit(1); exit(1);
} }
/* Specification of protocol via CLI trumps implicit overrides */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
case (int) OPT_DEFAULT_CHARSET: case (int) OPT_DEFAULT_CHARSET:
if (default_charset == disabled_my_option) if (default_charset == disabled_my_option)
default_charset= (char *)mysql_universal_client_charset; default_charset= (char *)mysql_universal_client_charset;
break; break;
case 'P': case 'P':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == SOCKET_PROTOCOL_TO_FORCE)
{ {
ignore_protocol_override = TRUE; /* Port given on command line, switch protocol to use TCP */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_TCP;
}
/* If port is set via CLI, try to force protocol to TCP */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = MYSQL_PROTOCOL_TCP;
} }
break; break;
case 'S': case 'S':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == MYSQL_PROTOCOL_TCP)
{ {
ignore_protocol_override = TRUE; /* Socket given on command line, switch protocol to use SOCKETSt */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
/* Prioritize socket if set via command line */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = SOCKET_PROTOCOL_TO_FORCE;
} }
break; break;
} }
@ -1162,19 +1124,9 @@ static int get_options(int *argc, char ***argv)
return(ho_error); return(ho_error);
/* /*
Command line options override configured protocol Dumping under --system=stats with --replace or --insert-ignore is
*/ safe and will not result into race condition. Otherwise dump only
if (protocol_to_force > MYSQL_PROTOCOL_DEFAULT structure and ignore data by default while dumping.
&& protocol_to_force != opt_protocol)
{
warn_protocol_override(current_host, &opt_protocol, protocol_to_force);
}
/*
Dumping under --system=stats with --replace or --insert-ignore is safe and will not
result into race condition. Otherwise dump only structure and ignore data by default
while dumping.
*/ */
if (!(opt_system & OPT_SYSTEM_STATS) && !(opt_ignore || opt_replace_into)) if (!(opt_system & OPT_SYSTEM_STATS) && !(opt_ignore || opt_replace_into))
{ {

58
client/mysqlimport.c
View File

@ -64,8 +64,6 @@ static char * opt_mysql_unix_port=0;
static char *opt_plugin_dir= 0, *opt_default_auth= 0; static char *opt_plugin_dir= 0, *opt_default_auth= 0;
static longlong opt_ignore_lines= -1; static longlong opt_ignore_lines= -1;
static uint protocol_to_force= MYSQL_PROTOCOL_DEFAULT;
#include <sslopt-vars.h> #include <sslopt-vars.h>
static char **argv_to_free; static char **argv_to_free;
@ -227,9 +225,6 @@ static my_bool
get_one_option(const struct my_option *opt, const char *argument, get_one_option(const struct my_option *opt, const char *argument,
const char *filename) const char *filename)
{ {
/* Track when protocol is set via CLI to not force overrides */
static my_bool ignore_protocol_override = FALSE;
switch(opt->id) { switch(opt->id) {
case 'p': case 'p':
if (argument == disabled_my_option) if (argument == disabled_my_option)
@ -256,14 +251,6 @@ get_one_option(const struct my_option *opt, const char *argument,
case 'W': case 'W':
opt_protocol = MYSQL_PROTOCOL_PIPE; opt_protocol = MYSQL_PROTOCOL_PIPE;
opt_local_file=1; opt_local_file=1;
/* Prioritize pipe if explicit via command line */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
#endif #endif
case OPT_MYSQL_PROTOCOL: case OPT_MYSQL_PROTOCOL:
@ -273,45 +260,19 @@ get_one_option(const struct my_option *opt, const char *argument,
sf_leaking_memory= 1; /* no memory leak reports here */ sf_leaking_memory= 1; /* no memory leak reports here */
exit(1); exit(1);
} }
/* Specification of protocol via CLI trumps implicit overrides */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
case 'P': case 'P':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == SOCKET_PROTOCOL_TO_FORCE)
{ {
ignore_protocol_override = TRUE; /* Port given on command line, switch protocol to use TCP */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_TCP;
}
/* If port is set via CLI, try to force protocol to TCP */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = MYSQL_PROTOCOL_TCP;
} }
break; break;
case 'S': case 'S':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == MYSQL_PROTOCOL_TCP)
{ {
ignore_protocol_override = TRUE; /* Socket given on command line, switch protocol to use SOCKETSt */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
/* Prioritize socket if set via command line */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = SOCKET_PROTOCOL_TO_FORCE;
} }
break; break;
case '#': case '#':
@ -710,13 +671,6 @@ int main(int argc, char **argv)
return(1); return(1);
} }
/* Command line options override configured protocol */
if (protocol_to_force > MYSQL_PROTOCOL_DEFAULT
&& protocol_to_force != opt_protocol)
{
warn_protocol_override(current_host, &opt_protocol, protocol_to_force);
}
sf_leaking_memory=0; /* from now on we cleanup properly */ sf_leaking_memory=0; /* from now on we cleanup properly */
if (opt_use_threads && !lock_tables) if (opt_use_threads && !lock_tables)

59
client/mysqlshow.c
View File

@ -41,8 +41,6 @@ static char *opt_plugin_dir= 0, *opt_default_auth= 0;
static uint opt_protocol=0; static uint opt_protocol=0;
static uint protocol_to_force= MYSQL_PROTOCOL_DEFAULT;
static void get_options(int *argc,char ***argv); static void get_options(int *argc,char ***argv);
static uint opt_mysql_port=0; static uint opt_mysql_port=0;
static int list_dbs(MYSQL *mysql,const char *wild); static int list_dbs(MYSQL *mysql,const char *wild);
@ -81,14 +79,6 @@ int main(int argc, char **argv)
get_options(&argc,&argv); get_options(&argc,&argv);
/* Command line options override configured protocol */
if (protocol_to_force > MYSQL_PROTOCOL_DEFAULT
&& protocol_to_force != opt_protocol)
{
warn_protocol_override(host, &opt_protocol, protocol_to_force);
}
sf_leaking_memory=0; /* from now on we cleanup properly */ sf_leaking_memory=0; /* from now on we cleanup properly */
wild=0; wild=0;
if (argc) if (argc)
@ -308,9 +298,6 @@ get_one_option(const struct my_option *opt, const char *argument,
const char *filename) const char *filename)
{ {
/* Track when protocol is set via CLI to not force overrides */
static my_bool ignore_protocol_override = FALSE;
switch(opt->id) { switch(opt->id) {
case 'v': case 'v':
opt_verbose++; opt_verbose++;
@ -339,13 +326,6 @@ get_one_option(const struct my_option *opt, const char *argument,
case 'W': case 'W':
#ifdef _WIN32 #ifdef _WIN32
opt_protocol = MYSQL_PROTOCOL_PIPE; opt_protocol = MYSQL_PROTOCOL_PIPE;
/* Prioritize pipe if explicit via command line */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
#endif #endif
break; break;
case OPT_MYSQL_PROTOCOL: case OPT_MYSQL_PROTOCOL:
@ -355,47 +335,22 @@ get_one_option(const struct my_option *opt, const char *argument,
sf_leaking_memory= 1; /* no memory leak reports here */ sf_leaking_memory= 1; /* no memory leak reports here */
exit(1); exit(1);
} }
/* Specification of protocol via CLI trumps implicit overrides */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
case 'P': case 'P':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == SOCKET_PROTOCOL_TO_FORCE)
{ {
ignore_protocol_override = TRUE; /* Port given on command line, switch protocol to use TCP */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_TCP;
}
/* If port is set via CLI, try to force protocol to TCP */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = MYSQL_PROTOCOL_TCP;
} }
break; break;
case 'S': case 'S':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == MYSQL_PROTOCOL_TCP)
{ {
ignore_protocol_override = TRUE; /* Socket given on command line, switch protocol to use SOCKETSt */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
/* Prioritize socket if set via command line */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = SOCKET_PROTOCOL_TO_FORCE;
} }
break; break;
break;
case '#': case '#':
DBUG_PUSH(argument ? argument : "d:t:o"); DBUG_PUSH(argument ? argument : "d:t:o");
debug_check_flag= 1; debug_check_flag= 1;

57
client/mysqlslap.c
View File

@ -172,8 +172,6 @@ File csv_file;
static uint opt_protocol= 0; static uint opt_protocol= 0;
static uint protocol_to_force= MYSQL_PROTOCOL_DEFAULT;
static int get_options(int *argc,char ***argv); static int get_options(int *argc,char ***argv);
static uint opt_mysql_port= 0; static uint opt_mysql_port= 0;
@ -335,13 +333,6 @@ int main(int argc, char **argv)
exit(1); exit(1);
} }
/* Command line options override configured protocol */
if (protocol_to_force > MYSQL_PROTOCOL_DEFAULT
&& protocol_to_force != opt_protocol)
{
warn_protocol_override(host, &opt_protocol, protocol_to_force);
}
sf_leaking_memory=0; /* from now on we cleanup properly */ sf_leaking_memory=0; /* from now on we cleanup properly */
/* Seed the random number generator if we will be using it. */ /* Seed the random number generator if we will be using it. */
@ -744,9 +735,6 @@ static my_bool
get_one_option(const struct my_option *opt, const char *argument, get_one_option(const struct my_option *opt, const char *argument,
const char *filename) const char *filename)
{ {
/* Track when protocol is set via CLI to not force overrides */
static my_bool ignore_protocol_override = FALSE;
DBUG_ENTER("get_one_option"); DBUG_ENTER("get_one_option");
switch(opt->id) { switch(opt->id) {
case 'v': case 'v':
@ -776,13 +764,6 @@ get_one_option(const struct my_option *opt, const char *argument,
case 'W': case 'W':
#ifdef _WIN32 #ifdef _WIN32
opt_protocol= MYSQL_PROTOCOL_PIPE; opt_protocol= MYSQL_PROTOCOL_PIPE;
/* Prioritize pipe if explicit via command line */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
#endif #endif
break; break;
case OPT_MYSQL_PROTOCOL: case OPT_MYSQL_PROTOCOL:
@ -792,45 +773,19 @@ get_one_option(const struct my_option *opt, const char *argument,
sf_leaking_memory= 1; /* no memory leak reports here */ sf_leaking_memory= 1; /* no memory leak reports here */
exit(1); exit(1);
} }
/* Specification of protocol via CLI trumps implicit overrides */
if (filename[0] == '\0')
{
ignore_protocol_override = TRUE;
protocol_to_force = MYSQL_PROTOCOL_DEFAULT;
}
break; break;
case 'P': case 'P':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == SOCKET_PROTOCOL_TO_FORCE)
{ {
ignore_protocol_override = TRUE; /* Port given on command line, switch protocol to use TCP */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_TCP;
}
/* If port is set via CLI, try to force protocol to TCP */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = MYSQL_PROTOCOL_TCP;
} }
break; break;
case 'S': case 'S':
/* If port and socket are set, fall back to default behavior */ if (filename[0] == '\0')
if (protocol_to_force == MYSQL_PROTOCOL_TCP)
{ {
ignore_protocol_override = TRUE; /* Socket given on command line, switch protocol to use SOCKETSt */
protocol_to_force = MYSQL_PROTOCOL_DEFAULT; opt_protocol= MYSQL_PROTOCOL_SOCKET;
}
/* Prioritize socket if set via command line */
if (filename[0] == '\0' &&
!ignore_protocol_override &&
protocol_to_force == MYSQL_PROTOCOL_DEFAULT)
{
protocol_to_force = SOCKET_PROTOCOL_TO_FORCE;
} }
break; break;
case '#': case '#':

24
mysql-test/main/cli_options_force_protocol_not_win.result
View File

@ -4,21 +4,19 @@
# #
# The following group of tests should produce no warnings # The following group of tests should produce no warnings
# #
# exec MYSQL --host=localhost -e "status" 2>&1 | grep "Connection:\|WARNING:" # exec MYSQL --host=localhost -e "status" 2>&1 | grep "Connection:"
Connection: Localhost via UNIX socket Connection: Localhost via UNIX socket
# exec MYSQL --port=MASTER_MYPORT --protocol=tcp -e "status" 2>&1 | grep "Connection:\|WARNING:" # exec MYSQL --port=MASTER_MYPORT --protocol=tcp -e "status" 2>&1 | grep "Connection:"
Connection: localhost via TCP/IP Connection: localhost via TCP/IP
# exec MYSQL --host=localhost --port=MASTER_MYPORT --protocol=socket -e "status" 2>&1 | grep "Connection:\|WARNING:" # exec MYSQL --host=localhost --port=MASTER_MYPORT --protocol=socket -e "status" 2>&1 | grep "Connection:"
Connection: Localhost via UNIX socket Connection: Localhost via UNIX socket
# exec MYSQL --host=127.0.0.1 --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:" # exec MYSQL --host=127.0.0.1 --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
Connection: 127.0.0.1 via TCP/IP Connection: 127.0.0.1 via TCP/IP
# exec MYSQL --host=localhost --socket=MASTER_MYSOCK --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:" # exec MYSQL --host=localhost --socket=MASTER_MYSOCK --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
Connection: Localhost via UNIX socket Connection: localhost via TCP/IP
# exec MYSQL --host=localhost --socket=MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:\|WARNING:" # exec MYSQL --host=localhost --port=MASTER_MYPORT --socket=MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:"
Connection: Localhost via UNIX socket Connection: Localhost via UNIX socket
# # exec MYSQL --host=localhost --socket=MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:"
# The remaining tests should produce warnings Connection: Localhost via UNIX socket
# # exec MYSQL --host=localhost --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
# exec MYSQL --host=localhost --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:"
WARNING: Forcing protocol to TCP due to option specification. Please explicitly state intended protocol.
Connection: localhost via TCP/IP Connection: localhost via TCP/IP

34
mysql-test/main/cli_options_force_protocol_not_win.test
View File

@ -10,28 +10,26 @@
--echo # The following group of tests should produce no warnings --echo # The following group of tests should produce no warnings
--echo # --echo #
--echo # exec MYSQL --host=localhost -e "status" 2>&1 | grep "Connection:\|WARNING:" --echo # exec MYSQL --host=localhost -e "status" 2>&1 | grep "Connection:"
--exec $MYSQL --host=localhost -e "status" 2>&1 | grep "Connection:\|WARNING:" --exec $MYSQL --host=localhost -e "status" 2>&1 | grep "Connection:"
--echo # exec MYSQL --port=MASTER_MYPORT --protocol=tcp -e "status" 2>&1 | grep "Connection:\|WARNING:" --echo # exec MYSQL --port=MASTER_MYPORT --protocol=tcp -e "status" 2>&1 | grep "Connection:"
--exec $MYSQL --port=$MASTER_MYPORT --protocol=tcp -e "status" 2>&1 | grep "Connection:\|WARNING:" --exec $MYSQL --port=$MASTER_MYPORT --protocol=tcp -e "status" 2>&1 | grep "Connection:"
--echo # exec MYSQL --host=localhost --port=MASTER_MYPORT --protocol=socket -e "status" 2>&1 | grep "Connection:\|WARNING:" --echo # exec MYSQL --host=localhost --port=MASTER_MYPORT --protocol=socket -e "status" 2>&1 | grep "Connection:"
--exec $MYSQL --host=localhost --port=$MASTER_MYPORT --protocol=socket -e "status" 2>&1 | grep "Connection:\|WARNING:" --exec $MYSQL --host=localhost --port=$MASTER_MYPORT --protocol=socket -e "status" 2>&1 | grep "Connection:"
--echo # exec MYSQL --host=127.0.0.1 --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:" --echo # exec MYSQL --host=127.0.0.1 --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
--exec $MYSQL --host=127.0.0.1 --port=$MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:" --exec $MYSQL --host=127.0.0.1 --port=$MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
--echo # exec MYSQL --host=localhost --socket=MASTER_MYSOCK --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:" --echo # exec MYSQL --host=localhost --socket=MASTER_MYSOCK --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
--exec $MYSQL --host=localhost --socket=$MASTER_MYSOCK --port=$MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:" --exec $MYSQL --host=localhost --socket=$MASTER_MYSOCK --port=$MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
--echo # exec MYSQL --host=localhost --socket=MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:\|WARNING:" --echo # exec MYSQL --host=localhost --port=MASTER_MYPORT --socket=MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:"
--exec $MYSQL --host=localhost --socket=$MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:\|WARNING:" --exec $MYSQL --host=localhost --port=MASTER_MYPORT --socket=$MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:"
--echo # exec MYSQL --host=localhost --socket=MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:"
--exec $MYSQL --host=localhost --socket=$MASTER_MYSOCK -e "status" 2>&1 | grep "Connection:"
--echo # --echo # exec MYSQL --host=localhost --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
--echo # The remaining tests should produce warnings --exec $MYSQL --host=localhost --port=$MASTER_MYPORT -e "status" 2>&1 | grep "Connection:"
--echo #
--echo # exec MYSQL --host=localhost --port=MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:"
--exec $MYSQL --host=localhost --port=$MASTER_MYPORT -e "status" 2>&1 | grep "Connection:\|WARNING:"

25
mysql-test/main/cli_options_force_protocol_win.result
View File

@ -1,24 +1,17 @@
# #
# MDEV-14974: --port ignored for --host=localhost # MDEV-14974: --port ignored for --host=localhost
# #
# # exec MYSQL --host=localhost -e "status" 2>&1 | findstr /c:"Connection:"
# The following group of tests should produce no warnings
#
# exec MYSQL --host=localhost -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:"
Connection: localhost via TCP/IP Connection: localhost via TCP/IP
# exec MYSQL --host=localhost --port=MASTER_MYPORT -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" # exec MYSQL --host=localhost --port=MASTER_MYPORT -e "status" 2>&1 | findstr /c:"Connection:"
Connection: localhost via TCP/IP Connection: localhost via TCP/IP
# exec MYSQL --host=localhost --port=MASTER_MYPORT --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" # exec MYSQL --host=localhost --port=MASTER_MYPORT --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
Connection: localhost via TCP/IP Connection: localhost via TCP/IP
# exec MYSQL --host=localhost --protocol=pipe -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" # exec MYSQL --host=localhost --protocol=pipe -e "status" 2>&1 | findstr /c:"Connection:"
Connection: localhost via named pipe Connection: localhost via named pipe
# exec MYSQL --host=localhost -W -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" # exec MYSQL --host=localhost -W -e "status" 2>&1 | findstr /c:"Connection:"
Connection: localhost via named pipe
# exec MYSQL --host=localhost -W --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:"
Connection: localhost via named pipe
#
# The remaining tests should produce warnings
#
# exec MYSQL --host=localhost --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:"
WARNING: Forcing protocol to PIPE due to option specification. Please explicitly state intended protocol.
Connection: localhost via named pipe Connection: localhost via named pipe
# exec MYSQL --host=localhost -W --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
Connection: localhost via TCP/IP
# exec MYSQL --host=localhost --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
Connection: localhost via TCP/IP

38
mysql-test/main/cli_options_force_protocol_win.test
View File

@ -5,33 +5,23 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/windows.inc --source include/windows.inc
--echo # exec MYSQL --host=localhost -e "status" 2>&1 | findstr /c:"Connection:"
--exec $MYSQL --host=localhost -e "status" 2>&1 | findstr /c:"Connection:"
--echo # --echo # exec MYSQL --host=localhost --port=MASTER_MYPORT -e "status" 2>&1 | findstr /c:"Connection:"
--echo # The following group of tests should produce no warnings --exec $MYSQL --host=localhost --port=$MASTER_MYPORT -e "status" 2>&1 | findstr /c:"Connection:"
--echo #
--echo # exec MYSQL --host=localhost -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --echo # exec MYSQL --host=localhost --port=MASTER_MYPORT --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
--exec $MYSQL --host=localhost -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --exec $MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
--echo # exec MYSQL --host=localhost --port=MASTER_MYPORT -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --echo # exec MYSQL --host=localhost --protocol=pipe -e "status" 2>&1 | findstr /c:"Connection:"
--exec $MYSQL --host=localhost --port=$MASTER_MYPORT -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --exec $MYSQL --host=localhost --protocol=pipe -e "status" 2>&1 | findstr /c:"Connection:"
--echo # exec MYSQL --host=localhost --port=MASTER_MYPORT --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --echo # exec MYSQL --host=localhost -W -e "status" 2>&1 | findstr /c:"Connection:"
--exec $MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --exec $MYSQL --host=localhost -W -e "status" 2>&1 | findstr /c:"Connection:"
--echo # exec MYSQL --host=localhost --protocol=pipe -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --echo # exec MYSQL --host=localhost -W --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
--exec $MYSQL --host=localhost --protocol=pipe -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --exec $MYSQL --host=localhost -W --socket=$MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
--echo # exec MYSQL --host=localhost -W -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --echo # exec MYSQL --host=localhost --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
--exec $MYSQL --host=localhost -W -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:" --exec $MYSQL --host=localhost --socket=$MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:"
--echo # exec MYSQL --host=localhost -W --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:"
--exec $MYSQL --host=localhost -W --socket=$MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:"
--echo #
--echo # The remaining tests should produce warnings
--echo #
--echo # exec MYSQL --host=localhost --socket=MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:"
--exec $MYSQL --host=localhost --socket=$MASTER_MYSOCK -e "status" 2>&1 | findstr /c:"Connection:" /c:"WARNING:"

13
mysql-test/main/func_json.result
View File

@ -1674,7 +1674,18 @@ DROP TABLE t;
# End of 10.6 tests # End of 10.6 tests
# #
# #
# Beginning of 10.9 tests # MDEV-31147 json_normalize does not work correctly with MSAN build
#
CREATE TABLE t1 (val JSON);
ALTER TABLE t1 ADD COLUMN normalized_json JSON AS (JSON_NORMALIZE(val));
INSERT INTO t1 (val) VALUES ('15');
SELECT * FROM t1;
val normalized_json
15 1.5E1
DROP TABLE t1;
#
# End of 10.8 tests
#
# #
# MDEV-27677: Implement JSON_OVERLAPS() # MDEV-27677: Implement JSON_OVERLAPS()
# #

13
mysql-test/main/func_json.test
View File

@ -1114,7 +1114,18 @@ DROP TABLE t;
--echo # --echo #
--echo # --echo #
--echo # Beginning of 10.9 tests --echo # MDEV-31147 json_normalize does not work correctly with MSAN build
--echo #
CREATE TABLE t1 (val JSON);
ALTER TABLE t1 ADD COLUMN normalized_json JSON AS (JSON_NORMALIZE(val));
INSERT INTO t1 (val) VALUES ('15');
SELECT * FROM t1;
DROP TABLE t1;
--echo #
--echo # End of 10.8 tests
--echo #
--echo # --echo #
--echo # MDEV-27677: Implement JSON_OVERLAPS() --echo # MDEV-27677: Implement JSON_OVERLAPS()
--echo # --echo #

3
storage/innobase/include/trx0purge.h
View File

@ -42,9 +42,10 @@ trx_purge_add_undo_to_history(const trx_t* trx, trx_undo_t*& undo, mtr_t* mtr);
/** /**
Run a purge batch. Run a purge batch.
@param n_tasks number of purge tasks to submit to the queue @param n_tasks number of purge tasks to submit to the queue
@param history_size trx_sys.history_size()
@param truncate whether to truncate the history at the end of the batch @param truncate whether to truncate the history at the end of the batch
@return number of undo log pages handled in the batch */ @return number of undo log pages handled in the batch */
ulint trx_purge(ulint n_tasks, bool truncate); ulint trx_purge(ulint n_tasks, ulint history_size, bool truncate);
/** Rollback segements from a given transaction with trx-no /** Rollback segements from a given transaction with trx-no
scheduled for purge. */ scheduled for purge. */

24
storage/innobase/row/row0mysql.cc
View File

@ -67,16 +67,22 @@ Created 9/17/2000 Heikki Tuuri
#include <thread> #include <thread>
/*******************************************************************//** /** Delay an INSERT, DELETE or UPDATE operation if the purge is lagging. */
Delays an INSERT, DELETE or UPDATE operation if the purge is lagging. */ static void row_mysql_delay_if_needed()
static
void
row_mysql_delay_if_needed(void)
/*===========================*/
{ {
if (srv_dml_needed_delay) { const auto delay= srv_dml_needed_delay;
std::this_thread::sleep_for( if (UNIV_UNLIKELY(delay != 0))
std::chrono::microseconds(srv_dml_needed_delay)); {
/* Adjust for purge_coordinator_state::refresh() */
log_sys.latch.rd_lock(SRW_LOCK_CALL);
const lsn_t last= log_sys.last_checkpoint_lsn,
max_age= log_sys.max_checkpoint_age;
log_sys.latch.rd_unlock();
const lsn_t lsn= log_sys.get_lsn();
if ((lsn - last) / 4 >= max_age / 5)
buf_flush_ahead(last + max_age / 5, false);
srv_wake_purge_thread_if_not_active();
std::this_thread::sleep_for(std::chrono::microseconds(delay));
} }
} }

6
storage/innobase/srv/srv0mon.cc
View File

@ -734,7 +734,8 @@ static monitor_info_t innodb_counter_info[] =
{"purge_dml_delay_usec", "purge", {"purge_dml_delay_usec", "purge",
"Microseconds DML to be delayed due to purge lagging", "Microseconds DML to be delayed due to purge lagging",
MONITOR_DISPLAY_CURRENT, static_cast<monitor_type_t>(
MONITOR_EXISTING | MONITOR_DISPLAY_CURRENT),
MONITOR_DEFAULT_START, MONITOR_DML_PURGE_DELAY}, MONITOR_DEFAULT_START, MONITOR_DML_PURGE_DELAY},
{"purge_stop_count", "purge", {"purge_stop_count", "purge",
@ -1652,6 +1653,9 @@ srv_mon_process_existing_counter(
case MONITOR_RSEG_CUR_SIZE: case MONITOR_RSEG_CUR_SIZE:
value = srv_mon_get_rseg_size(); value = srv_mon_get_rseg_size();
break; break;
case MONITOR_DML_PURGE_DELAY:
value = srv_max_purge_lag_delay;
break;
case MONITOR_NUM_UNDO_SLOT_USED: case MONITOR_NUM_UNDO_SLOT_USED:
value = srv_mon_get_rseg_used(); value = srv_mon_get_rseg_used();
break; break;

19
storage/innobase/srv/srv0srv.cc
View File

@ -1659,27 +1659,32 @@ fewer_threads:
m_history_length= history_size; m_history_length= history_size;
if (history_size && if (!history_size)
trx_purge(n_use_threads, srv_dml_needed_delay= 0;
else if (trx_purge(n_use_threads, history_size,
!(++count % srv_purge_rseg_truncate_frequency) || !(++count % srv_purge_rseg_truncate_frequency) ||
purge_sys.truncate.current || purge_sys.truncate.current ||
(srv_shutdown_state != SRV_SHUTDOWN_NONE && (srv_shutdown_state != SRV_SHUTDOWN_NONE &&
srv_fast_shutdown == 0))) srv_fast_shutdown == 0)))
continue; continue;
if (m_running == sigcount) if (srv_dml_needed_delay);
else if (m_running == sigcount)
{ {
/* Purge was not woken up by srv_wake_purge_thread_if_not_active() */ /* Purge was not woken up by srv_wake_purge_thread_if_not_active() */
/* The magic number 5000 is an approximation for the case where we have /* The magic number 5000 is an approximation for the case where we have
cached undo log records which prevent truncate of rollback segments. */ cached undo log records which prevent truncate of rollback segments. */
wakeup= history_size && wakeup= history_size >= 5000 ||
(history_size >= 5000 || (history_size && history_size != trx_sys.history_size_approx());
history_size != trx_sys.history_size_approx());
break; break;
} }
else if (!trx_sys.history_exists())
if (!trx_sys.history_exists())
{
srv_dml_needed_delay= 0;
break; break;
}
if (!srv_purge_should_exit()) if (!srv_purge_should_exit())
goto loop; goto loop;

61
storage/innobase/trx/trx0purge.cc
View File

@ -1243,43 +1243,6 @@ trx_purge_attach_undo_recs(ulint n_purge_threads)
return(n_pages_handled); return(n_pages_handled);
} }
/*******************************************************************//**
Calculate the DML delay required.
@return delay in microseconds or ULINT_MAX */
static
ulint
trx_purge_dml_delay(void)
/*=====================*/
{
/* Determine how much data manipulation language (DML) statements
need to be delayed in order to reduce the lagging of the purge
thread. */
ulint delay = 0; /* in microseconds; default: no delay */
/* If purge lag is set then calculate the new DML delay. */
if (srv_max_purge_lag > 0) {
double ratio = static_cast<double>(trx_sys.history_size()) /
static_cast<double>(srv_max_purge_lag);
if (ratio > 1.0) {
/* If the history list length exceeds the
srv_max_purge_lag, the data manipulation
statements are delayed by at least 5000
microseconds. */
delay = (ulint) ((ratio - .5) * 10000);
}
if (delay > srv_max_purge_lag_delay) {
delay = srv_max_purge_lag_delay;
}
MONITOR_SET(MONITOR_DML_PURGE_DELAY, delay);
}
return(delay);
}
extern tpool::waitable_task purge_worker_task; extern tpool::waitable_task purge_worker_task;
/** Wait for pending purge jobs to complete. */ /** Wait for pending purge jobs to complete. */
@ -1324,17 +1287,17 @@ TRANSACTIONAL_INLINE void purge_sys_t::clone_end_view()
/** /**
Run a purge batch. Run a purge batch.
@param n_tasks number of purge tasks to submit to the queue @param n_tasks number of purge tasks to submit to the queue
@param history_size trx_sys.history_size()
@param truncate whether to truncate the history at the end of the batch @param truncate whether to truncate the history at the end of the batch
@return number of undo log pages handled in the batch */ @return number of undo log pages handled in the batch */
TRANSACTIONAL_TARGET ulint trx_purge(ulint n_tasks, bool truncate) TRANSACTIONAL_TARGET
ulint trx_purge(ulint n_tasks, ulint history_size, bool truncate)
{ {
que_thr_t* thr = NULL; que_thr_t* thr = NULL;
ulint n_pages_handled; ulint n_pages_handled;
ut_ad(n_tasks > 0); ut_ad(n_tasks > 0);
srv_dml_needed_delay = trx_purge_dml_delay();
purge_sys.clone_oldest_view(); purge_sys.clone_oldest_view();
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
@ -1346,6 +1309,24 @@ TRANSACTIONAL_TARGET ulint trx_purge(ulint n_tasks, bool truncate)
/* Fetch the UNDO recs that need to be purged. */ /* Fetch the UNDO recs that need to be purged. */
n_pages_handled = trx_purge_attach_undo_recs(n_tasks); n_pages_handled = trx_purge_attach_undo_recs(n_tasks);
{
ulint delay = n_pages_handled ? srv_max_purge_lag : 0;
if (UNIV_UNLIKELY(delay)) {
if (delay >= history_size) {
no_throttle:
delay = 0;
} else if (const ulint max_delay =
srv_max_purge_lag_delay) {
delay = std::min(max_delay,
10000 * history_size / delay
- 5000);
} else {
goto no_throttle;
}
}
srv_dml_needed_delay = delay;
}
/* Submit tasks to workers queue if using multi-threaded purge. */ /* Submit tasks to workers queue if using multi-threaded purge. */
for (ulint i = n_tasks; --i; ) { for (ulint i = n_tasks; --i; ) {
thr = que_fork_scheduler_round_robin(purge_sys.query, thr); thr = que_fork_scheduler_round_robin(purge_sys.query, thr);

5
strings/json_normalize.c
View File

@ -147,6 +147,8 @@ json_normalize_number(DYNAMIC_STRING *out, const char *str, size_t str_len)
magnitude = (long)(j - 1); magnitude = (long)(j - 1);
if (i < str_len)
{
/* skip the . */ /* skip the . */
if (str[i] == '.') if (str[i] == '.')
++i; ++i;
@ -154,6 +156,7 @@ json_normalize_number(DYNAMIC_STRING *out, const char *str, size_t str_len)
/* grab rest of digits before the E */ /* grab rest of digits before the E */
for (; i < str_len && str[i] != 'e' && str[i] != 'E'; ++i) for (; i < str_len && str[i] != 'e' && str[i] != 'E'; ++i)
buf[j++] = str[i]; buf[j++] = str[i];
}
/* trim trailing zeros */ /* trim trailing zeros */
for (k = j - 1; k && buf[k] == '0'; --k, --j) for (k = j - 1; k && buf[k] == '0'; --k, --j)
@ -187,7 +190,7 @@ json_normalize_number(DYNAMIC_STRING *out, const char *str, size_t str_len)
err|= dynstr_append_mem(out, STRING_WITH_LEN("E")); err|= dynstr_append_mem(out, STRING_WITH_LEN("E"));
if (str[i] == 'e' || str[i] == 'E') if (i < str_len && (str[i] == 'e' || str[i] == 'E'))
{ {
char *endptr = NULL; char *endptr = NULL;
/* skip the [eE] */ /* skip the [eE] */