diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 13:32:38 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 13:32:38 +0200 |
commit | bb76dcbec77d31818ec7dfc0d0dc1f4b49185bc5 (patch) | |
tree | 0c288f685ac6fbc8d4bd4cdbc60bcf9942f019f7 /sql/item_func.cc | |
parent | 1ac8149b83f002cd4754e1eca225560bc02b22e4 (diff) | |
parent | 55e07d9ade51e9e969f528d903509806142f4d1e (diff) | |
download | mariadb-git-bb76dcbec77d31818ec7dfc0d0dc1f4b49185bc5.tar.gz |
Merge branch '10.9' into 10.10
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index a7b99bdb3e6..a07595cbbd8 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4609,10 +4609,12 @@ longlong Item_func_sleep::val_int() mysql_cond_destroy(&cond); +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("sleep_inject_query_done_debug_sync", { debug_sync_set_action (thd, STRING_WITH_LEN("dispatch_command_end SIGNAL query_done")); };); +#endif return MY_TEST(!error); // Return 1 killed } |