diff --git a/include/ma_global.h b/include/ma_global.h
index d6077f31..d3f4a714 100644
--- a/include/ma_global.h
+++ b/include/ma_global.h
@@ -226,7 +226,7 @@
 #endif
 
 /* #define USE_some_charset 1 was deprecated by changes to configure */
-/* my_ctype my_to_upper, my_to_lower, my_sort_order gain theit right value */
+/* my_ctype my_to_upper, my_to_lower, my_sort_order gain their right value */
 /* automagically during configuration */
 
 /* Does the system remember a signal handler after a signal ? */
@@ -578,7 +578,7 @@ typedef long my_ptrdiff_t;
 #define STDCALL
 #endif
 
-/* Typdefs for easyier portability */
+/* Typedefs for easyier portability */
 
 #if defined(VOIDTYPE)
 typedef void	*gptr;		/* Generic pointer */
@@ -741,7 +741,7 @@ typedef char		bool;	/* Ordinary boolean values 0 1 */
 #endif /* L64 */
 #endif /* _WIN32 */
 /*
-** Define-funktions for reading and storing in machine independent format
+** Define-functions for reading and storing in machine independent format
 **  (low byte first)
 */
 
diff --git a/include/ma_sys.h b/include/ma_sys.h
index 18914c94..9b6cd007 100644
--- a/include/ma_sys.h
+++ b/include/ma_sys.h
@@ -209,7 +209,7 @@ extern char *defaults_extra_file;
 typedef struct wild_file_pack	/* Struct to hold info when selecting files */
 {
   uint		wilds;		/* How many wildcards */
-  uint		not_pos;	/* Start of not-theese-files */
+  uint		not_pos;	/* Start of not-these-files */
   my_string	*wild;		/* Pointer to wildcards */
 } WF_PACK;
 
diff --git a/include/mariadb_rpl.h b/include/mariadb_rpl.h
index f3e39894..7c416c30 100644
--- a/include/mariadb_rpl.h
+++ b/include/mariadb_rpl.h
@@ -96,13 +96,14 @@ enum mariadb_rpl_event {
   TRANSACTION_CONTEXT_EVENT= 36,
   VIEW_CHANGE_EVENT= 37,
   XA_PREPARE_LOG_EVENT= 38,
+  PARTIAL_UPDATE_ROWS_EVENT = 39,
 
   /*
     Add new events here - right above this comment!
     Existing events (except ENUM_END_EVENT) should never change their numbers
   */
 
-  /* New MySQL/Sun events are to be added right above this comment */
+  /* New MySQL events are to be added right above this comment */
   MYSQL_EVENTS_END,
 
   MARIA_EVENTS_BEGIN= 160,
diff --git a/include/mysql.h b/include/mysql.h
index d87a4d66..44e40231 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -859,7 +859,7 @@ struct st_mariadb_methods {
 					   const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag);
   void (*db_close)(MYSQL *mysql);
   int (*db_command)(MYSQL *mysql,enum enum_server_command command, const char *arg,
-                    size_t length, my_bool skipp_check, void *opt_arg);
+                    size_t length, my_bool skip_check, void *opt_arg);
   void (*db_skip_result)(MYSQL *mysql);
   int (*db_read_query_result)(MYSQL *mysql);
   MYSQL_DATA *(*db_read_rows)(MYSQL *mysql,MYSQL_FIELD *fields, unsigned int field_count);
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index aac0e25f..3db221d5 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -373,7 +373,7 @@ void free_rows(MYSQL_DATA *cur)
 
 int
 mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
-	       size_t length, my_bool skipp_check, void *opt_arg)
+	       size_t length, my_bool skip_check, void *opt_arg)
 {
   NET *net= &mysql->net;
   int result= -1;
@@ -392,7 +392,7 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
 
   if (IS_CONNHDLR_ACTIVE(mysql))
   {
-    result= mysql->extension->conn_hdlr->plugin->set_connection(mysql, command, arg, length, skipp_check, opt_arg);
+    result= mysql->extension->conn_hdlr->plugin->set_connection(mysql, command, arg, length, skip_check, opt_arg);
     if (result== -1)
       return(result);
   }
@@ -443,9 +443,9 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
   result=0;
 
   if (net->extension->multi_status > COM_MULTI_OFF)
-    skipp_check= 1;
+    skip_check= 1;
 
-  if (!skipp_check)
+  if (!skip_check)
   {
     result= ((mysql->packet_length=ma_net_safe_read(mysql)) == packet_error ?
 	     1 : 0);
@@ -456,9 +456,9 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
 
 int
 ma_simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
-	       size_t length, my_bool skipp_check, void *opt_arg)
+	       size_t length, my_bool skip_check, void *opt_arg)
 {
-  return mysql->methods->db_command(mysql, command, arg, length, skipp_check, opt_arg);
+  return mysql->methods->db_command(mysql, command, arg, length, skip_check, opt_arg);
 }
 
 int ma_multi_command(MYSQL *mysql, enum enum_multi_status status)
diff --git a/unittest/libmariadb/CMakeLists.txt b/unittest/libmariadb/CMakeLists.txt
index de0b3d9d..876e5cfc 100644
--- a/unittest/libmariadb/CMakeLists.txt
+++ b/unittest/libmariadb/CMakeLists.txt
@@ -33,7 +33,7 @@ ENDIF()
 
 SET(API_TESTS ${API_TESTS} "async")
 
-#exclude following tests from ctests, since we need to run them maually with different credentials
+#exclude following tests from ctests, since we need to run them manually with different credentials
 SET(MANUAL_TESTS "t_conc173" "rpl_api")
 # Get finger print from server certificate
 IF(WITH_SSL)
diff --git a/unittest/libmariadb/cursor.c b/unittest/libmariadb/cursor.c
index c75cdf35..f6cbe1d2 100644
--- a/unittest/libmariadb/cursor.c
+++ b/unittest/libmariadb/cursor.c
@@ -755,7 +755,7 @@ static int test_bug11656(MYSQL *mysql)
   return OK;
 }
 
-/* Cursors: opening a cursor to a compilicated query with ORDER BY */
+/* Cursors: opening a cursor to a complicated query with ORDER BY */
 
 static int test_bug11901(MYSQL *mysql)
 {
@@ -1700,7 +1700,7 @@ static int test_bug9478(MYSQL *mysql)
   return OK;
 }
 
-/* Crash when opening a cursor to a query with DISTICNT and no key */
+/* Crash when opening a cursor to a query with DISTINCT and no key */
 
 static int test_bug9520(MYSQL *mysql)
 {
diff --git a/unittest/libmariadb/fetch.c b/unittest/libmariadb/fetch.c
index 6394e51d..55b1314a 100644
--- a/unittest/libmariadb/fetch.c
+++ b/unittest/libmariadb/fetch.c
@@ -607,7 +607,7 @@ static int test_fetch_null(MYSQL *mysql)
   strcpy((char *)query , "SELECT * FROM test_fetch_null");
 
   rc= my_stmt_result(mysql, query);
-  FAIL_UNLESS(rc == 3, "Exoected 3 rows");
+  FAIL_UNLESS(rc == 3, "Expected 3 rows");
 
   stmt = mysql_stmt_init(mysql);
   FAIL_IF(!stmt, mysql_error(mysql));
@@ -630,7 +630,7 @@ static int test_fetch_null(MYSQL *mysql)
       FAIL_IF(!is_null[i], "Expected is_null");
     }
     FAIL_UNLESS(nData == 1000 || nData == 88 || nData == 389789, "Wrong value for nData");
-    FAIL_UNLESS(is_null[i] == 0, "Exoected !is_null");
+    FAIL_UNLESS(is_null[i] == 0, "Expected !is_null");
     FAIL_UNLESS(length[i] == 4, "Expected length=4");
   }
   FAIL_UNLESS(rc == 3, "Expected 3 rows");
diff --git a/unittest/libmariadb/ps.c b/unittest/libmariadb/ps.c
index fd3f091a..111ce2a6 100644
--- a/unittest/libmariadb/ps.c
+++ b/unittest/libmariadb/ps.c
@@ -4382,7 +4382,7 @@ static int test_set_option(MYSQL *mysql)
   rc= 0;
   while (mysql_fetch_row(result))
     rc++;
-  FAIL_UNLESS(rc == 2, "rowcunt != 2");
+  FAIL_UNLESS(rc == 2, "rowcount != 2");
   mysql_free_result(result);
 
   stmt= mysql_stmt_init(mysql);
diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
index ab8bdbb2..61d15a88 100644
--- a/unittest/libmariadb/ps_bugs.c
+++ b/unittest/libmariadb/ps_bugs.c
@@ -3262,7 +3262,7 @@ static int test_mem_overun(MYSQL *mysql)
   int        rc, i, length;
 
   /*
-    Test a memory ovverun bug when a table had 1000 fields with
+    Test a memory overrun bug when a table had 1000 fields with
     a row of data
   */
   rc= mysql_query(mysql, "drop table if exists t_mem_overun");
diff --git a/unittest/libmariadb/result.c b/unittest/libmariadb/result.c
index 9f62ae05..c4a56438 100644
--- a/unittest/libmariadb/result.c
+++ b/unittest/libmariadb/result.c
@@ -1060,7 +1060,7 @@ static int test_conc160(MYSQL *mysql)
   result= mysql_store_result(mysql);
   field= mysql_fetch_field(result);
 
-  FAIL_UNLESS(field->flags & NUM_FLAG, "Numceric flag not set");
+  FAIL_UNLESS(field->flags & NUM_FLAG, "Numeric flag not set");
 
   mysql_free_result(result);
   return OK;
diff --git a/unittest/mytap/tap.c b/unittest/mytap/tap.c
index d0b52f4d..0290389f 100644
--- a/unittest/mytap/tap.c
+++ b/unittest/mytap/tap.c
@@ -365,7 +365,7 @@ int exit_status() {
 
    This is to test that the component have the expected behaviour.
    This is just plain simple: test that it works.  For example, test
-   that you can unpack what you packed, adding gives the sum, pincing
+   that you can unpack what you packed, adding gives the sum, pinching
    the duck makes it quack.
 
    This is what everybody does when they write tests.