Merge branch '10.0' into 10.1

3 files changed, 6 insertions, 6 deletions

diff --git a/tests/async_queries.c b/tests/async_queries.c
index 75229eec4b4..76e884e6a69 100644
--- a/tests/async_queries.c
+++ b/tests/async_queries.c
@@ -265,7 +265,7 @@ again:
     {
       if (mysql_errno(&sd->mysql))
       {
-        /* An error occured. */
+        /* An error occurred. */
         printf("%d | Error: %s\n", sd->index, mysql_error(&sd->mysql));
       }
       else
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index dd892b45449..bde146b2f21 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -11781,10 +11781,10 @@ static void test_bug5315()
   rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
   DIE_UNLESS(rc == 0);
   if (!opt_silent)
-    printf("Excuting mysql_change_user\n");
+    printf("Executing mysql_change_user\n");
   mysql_change_user(mysql, opt_user, opt_password, current_db);
   if (!opt_silent)
-    printf("Excuting mysql_stmt_execute\n");
+    printf("Executing mysql_stmt_execute\n");
   rc= mysql_stmt_execute(stmt);
   DIE_UNLESS(rc != 0);
   if (rc)
@@ -11794,10 +11794,10 @@ static void test_bug5315()
   }
   /* check that connection is OK */
   if (!opt_silent)
-    printf("Excuting mysql_stmt_close\n");
+    printf("Executing mysql_stmt_close\n");
   mysql_stmt_close(stmt);
   if (!opt_silent)
-    printf("Excuting mysql_stmt_init\n");
+    printf("Executing mysql_stmt_init\n");
   stmt= mysql_stmt_init(mysql);
   rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
   DIE_UNLESS(rc == 0);
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)