1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-27233 Fixes to make SQL SERVICE working

Browse Source
This commit is contained in:
Alexey Botchkov 2022-01-18 12:14:25 +04:00 committed by Nayuta Yanagisawa
parent 3905c12b09
commit e967e81089
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_prepare.cc
View File

@ -5630,6 +5630,7 @@ public:
MEM_ROOT *alloc; MEM_ROOT *alloc;
THD *new_thd; THD *new_thd;
Security_context empty_ctx; Security_context empty_ctx;
ulonglong client_capabilities;
my_bool do_log_bin; my_bool do_log_bin;
@ -6257,6 +6258,7 @@ loc_advanced_command(MYSQL *mysql, enum enum_server_command command,
{ {
Ed_connection con(p->thd); Ed_connection con(p->thd);
Security_context *ctx_orig= p->thd->security_ctx; Security_context *ctx_orig= p->thd->security_ctx;
ulonglong cap_orig= p->thd->client_capabilities;
MYSQL_LEX_STRING sql_text; MYSQL_LEX_STRING sql_text;
my_bool log_bin_orig; my_bool log_bin_orig;
p->set_binlog_vars(&log_bin_orig); p->set_binlog_vars(&log_bin_orig);
@ -6265,7 +6267,9 @@ loc_advanced_command(MYSQL *mysql, enum enum_server_command command,
sql_text.str= (char *) arg; sql_text.str= (char *) arg;
sql_text.length= arg_length; sql_text.length= arg_length;
p->thd->security_ctx= &p->empty_ctx; p->thd->security_ctx= &p->empty_ctx;
p->thd->client_capabilities= p->client_capabilities;
result= con.execute_direct(p, sql_text); result= con.execute_direct(p, sql_text);
p->thd->client_capabilities= cap_orig;
p->thd->security_ctx= ctx_orig; p->thd->security_ctx= ctx_orig;
p->restore_binlog_vars(log_bin_orig); p->restore_binlog_vars(log_bin_orig);
} }
@ -6391,6 +6395,7 @@ extern "C" MYSQL *mysql_real_connect_local(MYSQL *mysql)
THD *thd_orig= current_thd; THD *thd_orig= current_thd;
THD *new_thd; THD *new_thd;
Protocol_local *p; Protocol_local *p;
ulonglong client_flag;
DBUG_ENTER("mysql_real_connect_local"); DBUG_ENTER("mysql_real_connect_local");
/* Test whether we're already connected */ /* Test whether we're already connected */
@ -6402,6 +6407,9 @@ extern "C" MYSQL *mysql_real_connect_local(MYSQL *mysql)
mysql->methods= &local_methods; mysql->methods= &local_methods;
mysql->user= NULL; mysql->user= NULL;
client_flag= mysql->options.client_flag;
client_flag|= CLIENT_MULTI_RESULTS;;
client_flag&= ~(CLIENT_COMPRESS | CLIENT_PLUGIN_AUTH);
mysql->info_buffer= (char *) my_malloc(PSI_INSTRUMENT_ME, mysql->info_buffer= (char *) my_malloc(PSI_INSTRUMENT_ME,
MYSQL_ERRMSG_SIZE, MYF(0)); MYSQL_ERRMSG_SIZE, MYF(0));
@ -6425,6 +6433,7 @@ extern "C" MYSQL *mysql_real_connect_local(MYSQL *mysql)
new_thd->variables.wsrep_on= 0; new_thd->variables.wsrep_on= 0;
new_thd->variables.sql_log_bin= 0; new_thd->variables.sql_log_bin= 0;
new_thd->set_binlog_bit(); new_thd->set_binlog_bit();
new_thd->client_capabilities= client_flag;
/* /*
TOSO: decide if we should turn the auditing off TOSO: decide if we should turn the auditing off
@ -6446,6 +6455,7 @@ extern "C" MYSQL *mysql_real_connect_local(MYSQL *mysql)
{ {
p->empty_ctx.init(); p->empty_ctx.init();
p->empty_ctx.skip_grants(); p->empty_ctx.skip_grants();
p->client_capabilities= client_flag;
} }
mysql->thd= p; mysql->thd= p;