Commit b21b0b2a authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0
parents 936a6905 972da434

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static void close_cons() 
static void close_files()

{

  DBUG_ENTER("close_files");

  for (; cur_file != (file_stack-1) ; cur_file--)

  for (; cur_file >= file_stack; cur_file--)

  {

    DBUG_PRINT("info", ("file_name: %s", cur_file->file_name));

    if (cur_file->file && cur_file->file != stdin)

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

+2 −1
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ extern char wild_many,wild_one,wild_prefix; 
extern const char *charsets_dir;

extern char *defaults_extra_file;

extern const char *defaults_group_suffix;

extern const char *defaults_file;



extern my_bool timed_mutexes;
@@ -280,7 +281,7 @@ enum loglevel { 


enum cache_type

{

  READ_CACHE,WRITE_CACHE,

  TYPE_NOT_SET= 0, READ_CACHE, WRITE_CACHE,

  SEQ_READ_APPEND		/* sequential read or append */,

  READ_FIFO, READ_NET,WRITE_NET};