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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-12-16 07:47:17 +02:00
parent 745fd4b39f 8fa759a576
commit 28c89b7151
376 changed files with 6928 additions and 5364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
sql/sql_insert.cc
View File

@ -2147,11 +2147,15 @@ public:
ulong auto_increment_offset;
LEX_STRING query;
Time_zone *time_zone;
char *user, *host, *ip;
query_id_t query_id;
my_thread_id thread_id;
delayed_row(LEX_STRING const query_arg, enum_duplicates dup_arg,
bool ignore_arg, bool log_query_arg)
: record(0), dup(dup_arg), ignore(ignore_arg), log_query(log_query_arg),
forced_insert_id(0), query(query_arg), time_zone(0)
forced_insert_id(0), query(query_arg), time_zone(0),
user(0), host(0), ip(0)
{}
~delayed_row()
{
@ -2199,6 +2203,27 @@ public:
passed from connection thread to the handler thread.
*/
MDL_request grl_protection;
my_thread_id orig_thread_id;
void set_default_user()
{
thd.security_ctx->user=(char*) delayed_user;
thd.security_ctx->host=(char*) my_localhost;
thd.security_ctx->ip= NULL;
thd.query_id= 0;
thd.thread_id= orig_thread_id;
}
void set_user_from_row(const delayed_row *r)
{
if (r)
{
thd.security_ctx->user= r->user;
thd.security_ctx->host= r->host;
thd.security_ctx->ip= r->ip;
thd.query_id= r->query_id;
thd.thread_id= r->thread_id;
}
}
Delayed_insert(SELECT_LEX *current_select)
:locks_in_memory(0), thd(next_thread_id()),
@ -2206,8 +2231,8 @@ public:
status(0), retry(0), handler_thread_initialized(FALSE), group_count(0)
{
DBUG_ENTER("Delayed_insert constructor");
thd.security_ctx->user=(char*) delayed_user;
thd.security_ctx->host=(char*) my_localhost;
orig_thread_id= thd.thread_id;
set_default_user();
strmake_buf(thd.security_ctx->priv_user, thd.security_ctx->user);
thd.current_tablenr=0;
thd.set_command(COM_DELAYED_INSERT);
@ -2703,6 +2728,7 @@ int write_delayed(THD *thd, TABLE *table, enum_duplicates duplic,
delayed_row *row= 0;
Delayed_insert *di=thd->di;
const Discrete_interval *forced_auto_inc;
size_t user_len, host_len, ip_len;
DBUG_ENTER("write_delayed");
DBUG_PRINT("enter", ("query = '%s' length %lu", query.str,
(ulong) query.length));
@ -2736,11 +2762,45 @@ int write_delayed(THD *thd, TABLE *table, enum_duplicates duplic,
goto err;
}
user_len= host_len= ip_len= 0;
row->user= row->host= row->ip= NULL;
if (thd->security_ctx)
{
if (thd->security_ctx->user)
user_len= strlen(thd->security_ctx->user) + 1;
if (thd->security_ctx->host)
host_len= strlen(thd->security_ctx->host) + 1;
if (thd->security_ctx->ip)
ip_len= strlen(thd->security_ctx->ip) + 1;
}
/* This can't be THREAD_SPECIFIC as it's freed in delayed thread */
if (!(row->record= (char*) my_malloc(table->s->reclength,
if (!(row->record= (char*) my_malloc(table->s->reclength +
user_len + host_len + ip_len,
MYF(MY_WME))))
goto err;
memcpy(row->record, table->record[0], table->s->reclength);
if (thd->security_ctx)
{
if (thd->security_ctx->user)
{
row->user= row->record + table->s->reclength;
memcpy(row->user, thd->security_ctx->user, user_len);
}
if (thd->security_ctx->host)
{
row->host= row->record + table->s->reclength + user_len;
memcpy(row->host, thd->security_ctx->host, host_len);
}
if (thd->security_ctx->ip)
{
row->ip= row->record + table->s->reclength + user_len + host_len;
memcpy(row->ip, thd->security_ctx->ip, ip_len);
}
}
row->query_id= thd->query_id;
row->thread_id= thd->thread_id;
row->start_time= thd->start_time;
row->start_time_sec_part= thd->start_time_sec_part;
row->query_start_sec_part_used= thd->query_start_sec_part_used;
@ -3158,6 +3218,7 @@ pthread_handler_t handle_delayed_insert(void *arg)
if (di->tables_in_use && ! thd->lock &&
(!thd->killed || di->stacked_inserts))
{
di->set_user_from_row(di->rows.head());
/*
Request for new delayed insert.
Lock the table, but avoid to be blocked by a global read lock.
@ -3177,6 +3238,18 @@ pthread_handler_t handle_delayed_insert(void *arg)
}
if (di->stacked_inserts)
{
delayed_row *row;
I_List_iterator<delayed_row> it(di->rows);
while ((row= it++))
{
if (di->thd.thread_id != row->thread_id)
{
di->set_user_from_row(row);
mysql_audit_external_lock(&di->thd, di->table->s, F_WRLCK);
}
}
di->set_default_user();
if (di->handle_inserts())
{
/* Some fatal error */