Commit fd9993db authored by gkodinov/kgeorge@macbook.gmz's avatar gkodinov/kgeorge@macbook.gmz
Browse files

fixed warnings from the fix of 26243

parent 84f761da

myisam/mi_check.c

+1 −1
Original line number Diff line number Diff line
@@ -1935,7 +1935,7 @@ int mi_sort_index(MI_CHECK *param, register MI_INFO *info, my_string name) 
  for (key= 0,keyinfo= &share->keyinfo[0]; key < share->base.keys ;

       key++,keyinfo++)

    if (keyinfo->key_alg == HA_KEY_ALG_RTREE)

      return 0;

      DBUG_RETURN(0);



  if (!(param->testflag & T_SILENT))

    printf("- Sorting index for MyISAM-table '%s'\n",name);

myisam/mi_keycache.c

+1 −0
Original line number Diff line number Diff line
@@ -158,4 +158,5 @@ void mi_change_key_cache(KEY_CACHE *old_key_cache, 
  */

  multi_key_cache_change(old_key_cache, new_key_cache);

  pthread_mutex_unlock(&THR_LOCK_myisam);

  DBUG_VOID_RETURN;

}

mysys/mf_keycache.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ int resize_key_cache(KEY_CACHE *keycache, uint key_cache_block_size, 
  }

#endif

  keycache_pthread_mutex_unlock(&keycache->cache_lock);

  return blocks;

  DBUG_RETURN(blocks);

}

sql/examples/ha_tina.cc

+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ int ha_tina::delete_all_rows() 
  DBUG_ENTER("ha_tina::delete_all_rows");



  if (!records_is_known)

    return (my_errno=HA_ERR_WRONG_COMMAND);

    DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);



  /* Invalidate all cached mmap pages */

  if (free_mmap(share))

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -5115,7 +5115,7 @@ double Item_func_match::val_real() 
    DBUG_RETURN(-1.0);



  if (key != NO_SUCH_KEY && table->null_row) /* NULL row from an outer join */

    return 0.0;

    DBUG_RETURN(0.0);



  if (join_key)

  {