more fixes for buildbot failures

sql/log_event.cc:
  revert a wrong attempt to get rid of a warning.
  it broke tests on x86
sql/sql_show.cc:
  more fixes for old gcc

sql/log_event.cc

@@ -1716,9 +1716,11 @@ beg:
 
   case MYSQL_TYPE_DATETIME:
     {
-      uint64 d, t, i64= uint8korr(ptr); /* YYYYMMDDhhmmss */
-      d= i64 / 1000000;
-      t= i64 % 1000000;
+      /* these must be size_t, because it's what my_b_printf expects for %d */
+      size_t d, t;
+      uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */
+      d= (size_t)(i64 / 1000000);
+      t= (size_t)(i64 % 1000000);
       my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d",
                   d / 10000, (d % 10000) / 100, d % 100,
                   t / 10000, (t % 10000) / 100, t % 100);

sql/sql_show.cc

@@ -2253,25 +2253,28 @@ void remove_status_vars(SHOW_VAR *list)
 static void update_key_cache_stat_var(KEY_CACHE *key_cache, size_t ofs)
 {
   uint var_no;
-  switch (ofs) {
-  case offsetof(KEY_CACHE, blocks_used):
-  case offsetof(KEY_CACHE, blocks_unused): 
-  case offsetof(KEY_CACHE, global_blocks_changed):
+  if (ofs == offsetof(KEY_CACHE, blocks_used) ||
+      ofs == offsetof(KEY_CACHE, blocks_unused) ||
+      ofs == offsetof(KEY_CACHE, global_blocks_changed))
+  {
     var_no= (ofs-offsetof(KEY_CACHE, blocks_used))/sizeof(ulong);
     *(ulong *)((char *) key_cache + ofs)=
       (ulong) get_key_cache_stat_value(key_cache, var_no);
-    break; 
-  case offsetof(KEY_CACHE, global_cache_r_requests):
-  case offsetof(KEY_CACHE, global_cache_read):
-  case offsetof(KEY_CACHE, global_cache_w_requests):
-  case offsetof(KEY_CACHE, global_cache_write):
+    return;
+  }
+
+  if (ofs == offsetof(KEY_CACHE, global_cache_r_requests) ||
+      ofs == offsetof(KEY_CACHE, global_cache_read) ||
+      ofs == offsetof(KEY_CACHE, global_cache_w_requests) ||
+      ofs == offsetof(KEY_CACHE, global_cache_write))
+  {
     var_no= NUM_LONG_KEY_CACHE_STAT_VARIABLES +
             (ofs-offsetof(KEY_CACHE, global_cache_w_requests))/
              sizeof(ulonglong);
     *(ulonglong *)((char *) key_cache + ofs)=
       get_key_cache_stat_value(key_cache, var_no);
-    break;
-  } 
+    return;
+  }
 }