summaryrefslogtreecommitdiff
path: root/tests/nonblock-wrappers.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-03-21 13:02:53 +0100
committerSergei Golubchik <serg@mariadb.org>2016-03-21 13:02:53 +0100
commit3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch)
tree39cefed54f79f93f82e9c33a4e094270103bf137 /tests/nonblock-wrappers.h
parente7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff)
parent22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff)
downloadmariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz
Merge branch '10.0' into 10.1
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 3ed470b3400..d6f42511f3a 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)