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.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2018-11-06 16:24:16 +02:00
parent 563efeceec df563e0c03
commit 074c684099
394 changed files with 24300 additions and 10755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_insert.cc
View File

@ -2518,7 +2518,8 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
The thread could be killed with an error message if
di->handle_inserts() or di->open_and_lock_table() fails.
The thread could be killed without an error message if
killed using kill_delayed_threads_for_table().
killed using THD::notify_shared_lock() or
kill_delayed_threads_for_table().
*/
if (!thd.is_error())
my_message(ER_QUERY_INTERRUPTED, ER_THD(&thd, ER_QUERY_INTERRUPTED),