diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-09 15:09:41 +0100 |
commit | a15234bf4bf98d7833996284c033fc53a981f5d4 (patch) | |
tree | d989b448854f9d59de5ca16b962414591c8a5b2e /sql/threadpool_common.cc | |
parent | 9a6212008999da44b136605c1abf2cc9c7cc4b2c (diff) | |
parent | e5e5877740f248de848219ee3a1d2881cd5c5b82 (diff) | |
download | mariadb-git-a15234bf4bf98d7833996284c033fc53a981f5d4.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/threadpool_common.cc')
-rw-r--r-- | sql/threadpool_common.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc index 6577472e20b..efcc56d67be 100644 --- a/sql/threadpool_common.cc +++ b/sql/threadpool_common.cc @@ -192,7 +192,7 @@ void tp_callback(TP_connection *c) } else if (threadpool_process_request(thd)) { - /* QUIT or an error occured. */ + /* QUIT or an error occurred. */ goto error; } |