Fix two compiler warnings from Buildbot (including one bad merge).

sql/log_event.cc

@@ -8036,7 +8036,8 @@ void Annotate_rows_log_event::print(FILE *file, PRINT_EVENT_INFO *pinfo)
     // find end of the next line
     for (pend= pbeg + 1;
          ++cnt <= m_query_len && *pend != '\r' && *pend != '\n';
-         pend++);
+         pend++)
+      ;
 
     // print next line
     my_b_write(&pinfo->head_cache, (const uchar*) "#Q> ", 4);

sql/sql_repl.cc

@@ -556,7 +556,6 @@ impossible position";
       }
 #endif
 
-      if ((*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT)
       if ((uchar)(*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT)
       {
         binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+1] &