diff --git a/mysys/crc32/crc32_arm64.c b/mysys/crc32/crc32_arm64.c
index 6588606a015..0ed671b61e1 100644
--- a/mysys/crc32/crc32_arm64.c
+++ b/mysys/crc32/crc32_arm64.c
@@ -37,7 +37,7 @@ my_crc32_t crc32c_aarch64_available(void)
 static unsigned long getauxval(unsigned int key)
 {
   unsigned long val;
-  if (elf_aux_info(key, (void *)&val, (int)sizeof(val) != 0)
+  if (elf_aux_info(key, (void *)&val, (int)sizeof(val) != 0))
     return 0ul;
   return val;
 }
diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c
index 1503a5db442..39ec599cf91 100644
--- a/mysys/my_rdtsc.c
+++ b/mysys/my_rdtsc.c
@@ -349,7 +349,9 @@ static ulonglong my_timer_init_frequency(MY_TIMER_INFO *mti)
   }
   time4= my_timer_cycles() - mti->cycles.overhead;
   time4-= mti->microseconds.overhead;
-  return (mti->microseconds.frequency * (time4 - time1)) / (time3 - time2);
+  ulonglong denominator = time3 - time2;
+  if (denominator == 0) denominator = 1;
+  return (mti->microseconds.frequency * (time4 - time1)) / denominator;
 }
 
 /*
@@ -612,8 +614,10 @@ void my_timer_init(MY_TIMER_INFO *mti)
       if (time3 - time2 > 10) break;
     }
     time4= my_timer_cycles();
+    ulonglong denominator = time4 - time1;
+    if (denominator == 0) denominator = 1;
     mti->milliseconds.frequency=
-    (mti->cycles.frequency * (time3 - time2)) / (time4 - time1);
+    (mti->cycles.frequency * (time3 - time2)) / denominator;
   }
 
 /*
@@ -641,8 +645,12 @@ void my_timer_init(MY_TIMER_INFO *mti)
       if (time3 - time2 > 10) break;
     }
     time4= my_timer_cycles();
+    ulonglong denominator = time4 - time1;
+    if (denominator == 0) {
+      denominator = 1;
+    }
     mti->ticks.frequency=
-    (mti->cycles.frequency * (time3 - time2)) / (time4 - time1);
+    (mti->cycles.frequency * (time3 - time2)) / denominator;
   }
 }
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 561aca11e20..e0180b035d4 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2737,8 +2737,8 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
       DBUG_RETURN(1);
     lex->query_tables_last= query_tables_last;
     break;
-#endif
   }
+#endif
   case SCH_PROFILES:
     /* 
       Mark this current profiling record to be discarded.  We don't
diff --git a/storage/maria/ha_s3.cc b/storage/maria/ha_s3.cc
index b75481b3fc2..a9f71ce533c 100644
--- a/storage/maria/ha_s3.cc
+++ b/storage/maria/ha_s3.cc
@@ -549,6 +549,7 @@ int ha_s3::create(const char *name, TABLE *table_arg,
     s3_deinit(s3_client);
     if (error)
       maria_delete_table_files(name, 1, 0);
+  }
   else
 #endif /* MOVE_TABLE_TO_S3 */
   {