summaryrefslogtreecommitdiff
path: root/tests/nonblock-wrappers.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-04-09 17:03:48 +0200
commitcd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch)
tree95bf82d0e0522c6af708cd28639c82e004b5a264 /tests/nonblock-wrappers.h
parentf884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff)
parentd516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff)
downloadmariadb-git-10.2-connector-c-integ.tar.gz
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'tests/nonblock-wrappers.h')
-rw-r--r--tests/nonblock-wrappers.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/nonblock-wrappers.h b/tests/nonblock-wrappers.h
index 341c5aae1e7..fd50e4e4ee6 100644
--- a/tests/nonblock-wrappers.h
+++ b/tests/nonblock-wrappers.h
@@ -30,7 +30,7 @@
/*
Run the appropriate poll() syscall to wait for the event that libmysql
- requested. Return which event(s) occured.
+ requested. Return which event(s) occurred.
*/
static int
wait_for_mysql(MYSQL *mysql, int status)