diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e489d466d5f6bbd059e5a8918b8069219593d253..99754e8b7f6f001e87ce0ecbe5500ff63049e4d2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3244,12 +3244,11 @@ static int init_common_variables()
     desired page sizes.
   */
    int nelem;
-   int max_desired_page_size;
-   int max_page_size;
+   size_t max_desired_page_size;
    if (opt_super_large_pages)
-     max_page_size= SUPER_LARGE_PAGESIZE;
+     max_desired_page_size= SUPER_LARGE_PAGESIZE;
    else
-     max_page_size= LARGE_PAGESIZE;
+     max_desired_page_size= LARGE_PAGESIZE;
    nelem = getpagesizes(NULL, 0);
    if (nelem > 0)
    {
diff --git a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h
index 0f1631fde777a2259f8659c78776b3a4c55362c7..4bb59be6a3e2eaa1747232825ea6556a989b883a 100644
--- a/storage/innobase/include/ibuf0ibuf.h
+++ b/storage/innobase/include/ibuf0ibuf.h
@@ -43,7 +43,7 @@ typedef enum {
 	IBUF_OP_DELETE = 2,
 
 	/* Number of different operation types. */
-	IBUF_OP_COUNT = 3,
+	IBUF_OP_COUNT = 3
 } ibuf_op_t;
 
 /** Combinations of operations that can be buffered.  Because the enum
diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h
index 195691a420b2a8bf7669b27d649ce52f750161cc..110525ecfed072a7df2368a1ccdae23dbf2d8a53 100644
--- a/storage/innobase/include/row0row.h
+++ b/storage/innobase/include/row0row.h
@@ -267,7 +267,7 @@ enum row_search_result {
 				secondary index leaf page was not in
 				the buffer pool, and the operation was
 				enqueued in the insert/delete buffer */
-	ROW_NOT_DELETED_REF,	/*!< BTR_DELETE was specified, and
+	ROW_NOT_DELETED_REF	/*!< BTR_DELETE was specified, and
 				row_purge_poss_sec() failed */
 };
 
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index 1284203f7398190177dff6b6d1cfc50c8d78f3d4..e9786dacfdcd265cb49cd09f4eb0aa5d77d6f7d2 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -513,7 +513,7 @@ start:
     arg_count= max(arg_count, arg_index);
     goto start;
   }
-  DBUG_ASSERT(0);
+
   return 0;
 }