Commit ecffc1b8 authored by unknown's avatar unknown
Browse files

Several fixes revelaled by Intel compiler. 


cmd-line-utils/readline/complete.c:
  Added a cast.
dbug/my_main.c:
  Added an include to avoid implicit declaration of
  my_thread_global_init()
include/my_global.h:
  undef cannot be used on this predefined name.
  Since it is a custom fix for gcc 2.8.0, let's make it only
  effective in that case.
include/my_sys.h:
  Added a new type, TYPE_NOT_SET.
myisam/ft_boolean_search.c:
  Added casts.
myisam/mi_key.c:
  Added cast.
myisam/mi_open.c:
  Added cast.
  Changed function types.
myisam/mi_test1.c:
  Added cast.
myisam/myisamchk.c:
  Added cast.
myisam/myisamdef.h:
  Changed function type.
myisam/myisampack.c:
  Added casts.
myisam/sp_key.c:
  Added cast.
mysys/mf_iocache.c:
  Fixed invalid use of 0 to info->type. According to comment it
  should not have been set, but in earlier code by setting it
  to 0 would have been same as setting it to READ_CACHE. This
  probably was not desired, potential bug.
server-tools/instance-manager/instance_options.cc:
  Fixed a typo.
server-tools/instance-manager/protocol.cc:
  Changed enum to int.
  Changed char to uchar.
  Added casts.
sql/mysql_priv.h:
  Bit overflow.
sql/sql_base.cc:
  Removed unused label. The code below label was unused too, because
  there is a return just before.
sql/sql_parse.cc:
  Removed unneccessary extra argument.
parent abda6dc6

cmd-line-utils/readline/complete.c

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include <sys/types.h>

#include <fcntl.h>



#if defined (HAVE_SYS_FILE_H)

#  include <sys/file.h>

#endif
@@ -1149,7 +1150,8 @@ compute_lcd_of_matches (match_list, matches, text) 
	      rl_completion_found_quote &&

	      rl_filename_quoting_desired)

	    {

	      dtext = (*rl_filename_dequoting_function) (text, rl_completion_quote_character);

	      dtext = (*rl_filename_dequoting_function)

		((char*) text, rl_completion_quote_character);

	      text = dtext;

	    }

dbug/my_main.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#endif



#include <my_global.h>	/* This includes dbug.h */

#include <my_pthread.h>



int main (argc, argv)

int argc;

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ C_MODE_END 




/* Fix a bug in gcc 2.8.0 on IRIX 6.2 */

#if SIZEOF_LONG == 4 && defined(__LONG_MAX__)

#if SIZEOF_LONG == 4 && defined(__LONG_MAX__) && (__GNUC__ == 2 && __GNUC_MINOR__ == 8)

#undef __LONG_MAX__             /* Is a longlong value in gcc 2.8.0 ??? */

#define __LONG_MAX__ 2147483647

#endif

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ enum loglevel { 


enum cache_type

{

  READ_CACHE,WRITE_CACHE,

  TYPE_NOT_SET, READ_CACHE, WRITE_CACHE,

  SEQ_READ_APPEND		/* sequential read or append */,

  READ_FIFO, READ_NET,WRITE_NET};

myisam/ft_boolean_search.c

+2 −1
Original line number Diff line number Diff line
@@ -473,7 +473,8 @@ static int _ftb_check_phrase(const byte *s0, const byte *e0, 
    for (;;)

    {

      n_word= (FT_WORD *)phrase_element->data;

      if (my_strnncoll(cs, h_word.pos, h_word.len, n_word->pos, n_word->len))

      if (my_strnncoll(cs, (const uchar *) h_word.pos, h_word.len,

		       (const uchar *) n_word->pos, n_word->len))

        break;

      if (! (phrase_element= phrase_element->next))

        DBUG_RETURN(1);