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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2016-01-25 22:58:57 +01:00
parent 2ff65ba531 666b9663f9
commit f4faac4d6a
32 changed files with 1462 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.cc
View File

@@ -1817,7 +1817,8 @@ void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
void THD::awake(killed_state state_to_set)
{
DBUG_ENTER("THD::awake");
DBUG_PRINT("enter", ("this: %p current_thd: %p", this, current_thd));
DBUG_PRINT("enter", ("this: %p current_thd: %p state: %d",
this, current_thd, (int) state_to_set));
THD_CHECK_SENTRY(this);
mysql_mutex_assert_owner(&LOCK_thd_data);
@@ -4026,6 +4027,12 @@ void thd_increment_bytes_sent(void *thd, ulong length)
}
}
my_bool thd_net_is_killed()
{
THD *thd= current_thd;
return thd && thd->killed ? 1 : 0;
}
void thd_increment_bytes_received(void *thd, ulong length)
{