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

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-12-27 13:05:06 +02:00
parent ee9a19fb05 16bce0f6fe
commit 5ab70e7f68
60 changed files with 844 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sql/sql_insert.cc
View File

@@ -2171,36 +2171,16 @@ 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()),
table(0),tables_in_use(0), stacked_inserts(0),
status(0), retry(0), handler_thread_initialized(FALSE), group_count(0)
{
DBUG_ENTER("Delayed_insert constructor");
orig_thread_id= thd.thread_id;
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;
strmake_buf(thd.security_ctx->priv_user, thd.security_ctx->user);
thd.current_tablenr=0;
thd.set_command(COM_DELAYED_INSERT);
@@ -3178,7 +3158,6 @@ pthread_handler_t handle_delayed_insert(void *arg)
if (di->tables_in_use && ! thd->lock && !thd->killed)
{
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.
@@ -3200,16 +3179,18 @@ pthread_handler_t handle_delayed_insert(void *arg)
{
delayed_row *row;
I_List_iterator<delayed_row> it(di->rows);
my_thread_id cur_thd= di->thd.thread_id;
while ((row= it++))
{
if (di->thd.thread_id != row->thread_id)
if (cur_thd != row->thread_id)
{
di->set_user_from_row(row);
mysql_audit_external_lock(&di->thd, di->table->s, F_WRLCK);
mysql_audit_external_lock_ex(&di->thd, row->thread_id,
row->user, row->host, row->ip, row->query_id,
di->table->s, F_WRLCK);
cur_thd= row->thread_id;
}
}
di->set_default_user();
if (di->handle_inserts())
{
/* Some fatal error */