diff --git a/include/probes_mysql_nodtrace.h b/include/probes_mysql_nodtrace.h
index bc3b65a..f314f7e 100644
--- a/include/probes_mysql_nodtrace.h
+++ b/include/probes_mysql_nodtrace.h
@@ -16,11 +16,11 @@ extern "C" {
 #define	MYSQL_COMMAND_START(arg0, arg1, arg2, arg3)
 #define	MYSQL_COMMAND_START_ENABLED() (0)
 #define	MYSQL_COMMAND_DONE(arg0)
-#define	MYSQL_COMMAND_DONE_ENABLED() (0)
+#define	MYSQL_COMMAND_DONE_ENABLED() (false)
 #define	MYSQL_QUERY_START(arg0, arg1, arg2, arg3, arg4)
 #define	MYSQL_QUERY_START_ENABLED() (0)
 #define	MYSQL_QUERY_DONE(arg0)
-#define	MYSQL_QUERY_DONE_ENABLED() (0)
+#define	MYSQL_QUERY_DONE_ENABLED() (false)
 #define	MYSQL_QUERY_PARSE_START(arg0)
 #define	MYSQL_QUERY_PARSE_START_ENABLED() (0)
 #define	MYSQL_QUERY_PARSE_DONE(arg0)
@@ -54,17 +54,17 @@ extern "C" {
 #define	MYSQL_INDEX_READ_ROW_DONE(arg0)
 #define	MYSQL_INDEX_READ_ROW_DONE_ENABLED() (0)
 #define	MYSQL_HANDLER_RDLOCK_START(arg0, arg1)
-#define	MYSQL_HANDLER_RDLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_RDLOCK_START_ENABLED() (false)
 #define	MYSQL_HANDLER_WRLOCK_START(arg0, arg1)
-#define	MYSQL_HANDLER_WRLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_WRLOCK_START_ENABLED() (false)
 #define	MYSQL_HANDLER_UNLOCK_START(arg0, arg1)
-#define	MYSQL_HANDLER_UNLOCK_START_ENABLED() (0)
+#define	MYSQL_HANDLER_UNLOCK_START_ENABLED() (false)
 #define	MYSQL_HANDLER_RDLOCK_DONE(arg0)
-#define	MYSQL_HANDLER_RDLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_RDLOCK_DONE_ENABLED() (false)
 #define	MYSQL_HANDLER_WRLOCK_DONE(arg0)
-#define	MYSQL_HANDLER_WRLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_WRLOCK_DONE_ENABLED() (false)
 #define	MYSQL_HANDLER_UNLOCK_DONE(arg0)
-#define	MYSQL_HANDLER_UNLOCK_DONE_ENABLED() (0)
+#define	MYSQL_HANDLER_UNLOCK_DONE_ENABLED() (false)
 #define	MYSQL_FILESORT_START(arg0, arg1)
 #define	MYSQL_FILESORT_START_ENABLED() (0)
 #define	MYSQL_FILESORT_DONE(arg0, arg1)
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 6d718a6..12f93f2 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -440,7 +440,7 @@ static MYSQL_RES * emb_store_result(MYSQL *mysql)
 int emb_read_change_user_result(MYSQL *mysql)
 {
   mysql->net.read_pos= (uchar*)""; // fake an OK packet
-  return mysql_errno(mysql) ? packet_error : 1 /* length of the OK packet */;
+  return mysql_errno(mysql) ? (int)packet_error : 1 /* length of the OK packet */;
 }
 
 MYSQL_METHODS embedded_methods= 
diff --git a/mysys/default.c b/mysys/default.c
index a90f428..4260c8e 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -814,7 +814,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
       continue;
 
     /* Configuration File Directives */
-    if ((*ptr == '!'))
+    if (*ptr == '!')
     {
       if (recursion_level >= max_recursion_level)
       {
diff --git a/sql/item.cc b/sql/item.cc
index 665521c..b4f5cf8 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -8090,7 +8090,7 @@ bool Item_default_value::fix_fields(THD *thd, Item **items)
   }
   if (!(def_field= (Field*) sql_alloc(field_arg->field->size_of())))
     goto error;
-  memcpy(def_field, field_arg->field, field_arg->field->size_of());
+  memcpy((char *) def_field, (char *) field_arg->field, field_arg->field->size_of());
   def_field->move_field_offset((my_ptrdiff_t)
                                (def_field->table->s->default_values -
                                 def_field->table->record[0]));
@@ -8226,7 +8226,7 @@ bool Item_insert_value::fix_fields(THD *thd, Item **items)
     Field *def_field= (Field*) sql_alloc(field_arg->field->size_of());
     if (!def_field)
       return TRUE;
-    memcpy(def_field, field_arg->field, field_arg->field->size_of());
+    memcpy((char *) def_field, (char *) field_arg->field, field_arg->field->size_of());
     def_field->move_field_offset((my_ptrdiff_t)
                                  (def_field->table->insert_values -
                                   def_field->table->record[0]));
diff --git a/sql/log.cc b/sql/log.cc
index 254449d..90f311c 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2301,7 +2301,7 @@ static int find_uniq_filename(char *name)
   my_dirend(dir_info);
 
   /* check if reached the maximum possible extension number */
-  if ((max_found == MAX_LOG_UNIQUE_FN_EXT))
+  if (max_found == MAX_LOG_UNIQUE_FN_EXT)
   {
     sql_print_error("Log filename extension number exhausted: %06lu. \
 Please fix this by archiving old logs and \
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 7de7233..ea1e17a 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1370,7 +1370,7 @@ failed my_b_read"));
   Log_event *res=  0;
 #ifndef max_allowed_packet
   THD *thd=current_thd;
-  uint max_allowed_packet= thd ? slave_max_allowed_packet:~(ulong)0;
+  uint max_allowed_packet= thd ? slave_max_allowed_packet:~(uint)0;
 #endif
 
   if (data_len > max_allowed_packet)
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index fa3a07b..069fe64 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -84,7 +84,7 @@ static ulonglong get_exact_record_count(List<TABLE_LIST> &tables)
   while ((tl= ti++))
   {
     ha_rows tmp= tl->table->file->records();
-    if ((tmp == HA_POS_ERROR))
+    if (tmp == HA_POS_ERROR)
       return ULONGLONG_MAX;
     count*= tmp;
   }
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f136267..d805597 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -915,7 +915,7 @@ bool do_command(THD *thd)
   packet_length= my_net_read(net);
   thd->m_server_idle= FALSE;
 
-  if ((packet_length == packet_error))
+  if (packet_length == packet_error)
   {
     DBUG_PRINT("info",("Got error %d reading command from socket %s",
 		       net->error,
diff --git a/sql/unireg.cc b/sql/unireg.cc
index e40dc02..011edac 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -999,7 +999,7 @@ static bool pack_fields(File file, List<Create_field> &create_fields,
           for (uint j = 0; j < field->interval->type_lengths[i]; j++)
             occ[(unsigned int) (val[j])]= 1;
 
-        if (!occ[(unsigned char)NAMES_SEP_CHAR])
+        if (!occ[(unsigned int)NAMES_SEP_CHAR & 0xFF])
           sep= (unsigned char) NAMES_SEP_CHAR;
         else if (!occ[(unsigned int)','])
           sep= ',';
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 916c7b1..1761961 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -1413,9 +1413,9 @@ int ha_tina::rnd_end()
       DBUG_RETURN(-1);
 
     /* Open the file again */
-    if (((data_file= mysql_file_open(csv_key_file_data,
-                                     share->data_file_name,
-                                     O_RDONLY, MYF(MY_WME))) == -1))
+    if ((data_file= mysql_file_open(csv_key_file_data,
+                                    share->data_file_name,
+                                    O_RDONLY, MYF(MY_WME))) == -1)
       DBUG_RETURN(my_errno ? my_errno : -1);
     /*
       As we reopened the data file, increase share->data_file_version 
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index e1c2a38..057dbe0 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -764,7 +764,7 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATEDX_SHARE *share, TABLE *table,
         user:@hostname:port/db/table
         Then password is a null string, so set to NULL
       */
-      if ((share->password[0] == '\0'))
+      if (share->password[0] == '\0')
         share->password= NULL;
     }
 
diff --git a/storage/innobase/sync/sync0sync.cc b/storage/innobase/sync/sync0sync.cc
index af64d01..c492edf 100644
--- a/storage/innobase/sync/sync0sync.cc
+++ b/storage/innobase/sync/sync0sync.cc
@@ -309,9 +309,9 @@ mutex_create_func(
 
 	/* NOTE! The very first mutexes are not put to the mutex list */
 
-	if ((mutex == &mutex_list_mutex)
+	if (mutex == &mutex_list_mutex
 #ifdef UNIV_SYNC_DEBUG
-	    || (mutex == &sync_thread_mutex)
+	    || mutex == &sync_thread_mutex
 #endif /* UNIV_SYNC_DEBUG */
 	    ) {
 
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c
index e3668d3..64d4e29 100644
--- a/storage/maria/ma_bitmap.c
+++ b/storage/maria/ma_bitmap.c
@@ -164,7 +164,7 @@ static inline my_bool write_changed_bitmap(MARIA_SHARE *share,
   */
   bitmap->changed_not_flushed= 1;
 
-  if ((bitmap->non_flushable == 0)
+  if (bitmap->non_flushable == 0
 #ifdef WRONG_BITMAP_FLUSH
       || 1
 #endif
diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c
index 004dd23..72d8c60 100644
--- a/storage/maria/ma_blockrec.c
+++ b/storage/maria/ma_blockrec.c
@@ -7144,7 +7144,7 @@ my_bool _ma_apply_undo_row_delete(MARIA_HA *info, LSN undo_lsn,
 
       memcpy(field_pos, field_length_data, size_length);
       field_length_data+= size_length;
-      memcpy(field_pos + size_length, &header, sizeof(&header));
+      memcpy(field_pos + size_length, &header, sizeof(header));
       header+= blob_length;
       *blob_lengths++= blob_length;
       break;
diff --git a/storage/maria/ma_test3.c b/storage/maria/ma_test3.c
index c11de6f..64b22e45 100644
--- a/storage/maria/ma_test3.c
+++ b/storage/maria/ma_test3.c
@@ -114,7 +114,7 @@ int main(int argc,char **argv)
       sleep(1);
       return 0;
     }
-    rnd(1);
+    (void)rnd(1);
   }
 
   for (i=0 ; i < forks ; i++)
diff --git a/strings/decimal.c b/strings/decimal.c
index f318a23..cc77bef 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -669,7 +669,7 @@ int decimal_shift(decimal_t *dec, int shift)
     if (do_left)
     {
       do_mini_left_shift(dec, l_mini_shift, beg, end);
-      mini_shift=- l_mini_shift;
+      mini_shift= -l_mini_shift;
     }
     else
     {