diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 541fa7dfbe6..048ecb27cd5 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -750,7 +750,7 @@ void *thd_memdup(MYSQL_THD thd, const void* str, unsigned int size);
   @param thd      user thread connection handle
   @param lex_str  pointer to LEX_STRING object to be initialized
   @param str      initializer to be copied into lex_str
-  @param length   length of str, in bytes
+  @param size     length of str, in bytes
   @param allocate_lex_string  flag: if TRUE, allocate new LEX_STRING object,
                               instead of using lex_str value
   @return  NULL on failure, or pointer to the LEX_STRING object
diff --git a/sql/field.cc b/sql/field.cc
index acaf1576a8f..7ae8916de71 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -7644,7 +7644,7 @@ uchar *Field_blob::pack(uchar *to, const uchar *from, uint max_length)
 
    @param   to         Destination of the data
    @param   from       Source of the data
-   @param   param_data <not used>
+   @param   param_data not used
 
    @return  New pointer into memory based on from + length of the data
 */
diff --git a/sql/log_event.h b/sql/log_event.h
index e22a9785736..9db1d117ff6 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -435,7 +435,7 @@ struct sql_ex_info
   ((ULL(1) << 14) | (ULL(1) << 26) | (ULL(1) << 27) | (ULL(1) << 19))
 
 #if OPTIONS_WRITTEN_TO_BIN_LOG != EXPECTED_OPTIONS
-#error OPTIONS_WRITTEN_TO_BIN_LOG must NOT change their values!
+#error 1
 #endif
 #undef EXPECTED_OPTIONS         /* You shouldn't use this one */
 
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index 36dcedb3b88..1b6b3adb52b 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -177,6 +177,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
                   record on the master side
    @param rw_set  Pointer to bitmap that holds either the read_set or the
                   write_set of the table
+   @param event_type
 
 
    @retval 0 No error
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 8d13e3c7554..78b4f034f98 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1750,7 +1750,7 @@ void st_select_lex_unit::exclude_tree()
     'last' should be reachable from this st_select_lex_node
 */
 
-void st_select_lex::mark_as_dependent(SELECT_LEX *last)
+void st_select_lex::mark_as_dependent(st_select_lex *last)
 {
   /*
     Mark all selects from resolved to 1 before select where was
@@ -2368,7 +2368,7 @@ st_lex::copy_db_to(char **p_db, size_t *p_db_length) const
     values	- SELECT_LEX with initial values for counters
 */
 
-void st_select_lex_unit::set_limit(SELECT_LEX *sl)
+void st_select_lex_unit::set_limit(st_select_lex *sl)
 {
   ha_rows select_limit_val;
 
@@ -2898,7 +2898,7 @@ bool st_select_lex::add_index_hint (THD *thd, char *str, uint length)
   partitioning or if only partitions to add or to split.
 
   @note  This needs to be outside of WITH_PARTITION_STORAGE_ENGINE since it
-  is used from the sql parser that doesn't have any #ifdef's
+  is used from the sql parser that doesn't have any ifdef's
 
   @retval  TRUE    Yes, it is part of a management partition command
   @retval  FALSE          No, not a management partition command
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 22c7eb2ffb1..2e72a87c35d 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1512,9 +1512,9 @@ typedef struct st_lex : public Query_tables_list
   /** End of SELECT of CREATE VIEW statement */
   const char* create_view_select_end;
 
-  /** Start of 'ON <table>', in trigger statements.  */
+  /** Start of 'ON table', in trigger statements.  */
   const char* raw_trg_on_table_name_begin;
-  /** End of 'ON <table>', in trigger statements. */
+  /** End of 'ON table', in trigger statements. */
   const char* raw_trg_on_table_name_end;
 
   /* Partition info structure filled in by PARTITION BY parse part */