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

maria-10.0.16 merge

Browse Source 
bzr merge -r4588 maria/10.0
This commit is contained in:
Nirbhay Choubey
2015-01-26 22:54:27 -05:00
parent ea229eb6bb fb71449b10
commit 7cda4bee0e
409 changed files with 13043 additions and 2869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.h
View File

@ -3293,6 +3293,14 @@ public:
mysql_mutex_unlock(&LOCK_thd_data);
}
}
inline void reset_kill_query()
{
if (killed < KILL_CONNECTION)
{
reset_killed();
mysys_var->abort= 0;
}
}
inline void send_kill_message() const
{
int err= killed_errno();