Commit 2bfa624a authored by tsmith@maint1.mysql.com's avatar tsmith@maint1.mysql.com
Browse files

Merge maint1.mysql.com:/data/localhome/tsmith/bk/41 

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
parents 78e900dd 06eb3e28

cmd-line-utils/libedit/el_term.h

+10 −0
Original line number Diff line number Diff line
@@ -90,6 +90,16 @@ extern char* tgoto(const char*, int, int); 
extern char* tgetstr(char*, char**);

#endif





#if !HAVE_DECL_TGOTO

/*

  'tgoto' is not declared in the system header files, this causes

  problems on 64-bit systems. The function returns a 64 bit pointer

  but caller see it as "int" and it's thus truncated to 32-bit

*/

extern char* tgoto(const char*, int, int);

#endif



protected void	term_move_to_line(EditLine *, int);

protected void	term_move_to_char(EditLine *, int);

protected void	term_clear_EOL(EditLine *, int);

configure.in

+13 −0
Original line number Diff line number Diff line
@@ -1960,6 +1960,19 @@ else 
fi

AC_SUBST(TERMCAP_LIB)



# Check if the termcap function 'tgoto' is already declared in

# system header files or if it need to be declared locally

AC_CHECK_DECLS(tgoto,,,[

#ifdef HAVE_CURSES_H

# include <curses.h>

#elif HAVE_NCURSES_H

# include <ncurses.h>

#endif

#ifdef HAVE_TERM_H

# include <term.h>

#endif

])



LIBEDIT_LOBJECTS=""

AC_CHECK_FUNC(strunvis, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS unvis.o"])

AC_CHECK_FUNC(strvis,   ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS vis.o"])

include/my_global.h

+6 −1
Original line number Diff line number Diff line
@@ -828,7 +828,12 @@ error "Neither int or long is of 4 bytes width" 
typedef unsigned long	ulong;		  /* Short for unsigned long */

#endif

#ifndef longlong_defined

#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8

/* 

  Using [unsigned] long long is preferable as [u]longlong because we use 

  [unsigned] long long unconditionally in many places, 

  for example in constants with [U]LL suffix.

*/

#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8

typedef unsigned long long int ulonglong; /* ulong or unsigned long long */

typedef long long int	longlong;

#else

mysql-test/mysql-test-run.pl

+7 −4
Original line number Diff line number Diff line
@@ -3106,9 +3106,12 @@ sub find_testcase_skipped_reason($) 
{

  my ($tinfo)= @_;



  # Set default message

  $tinfo->{'comment'}= "Detected by testcase(no log file)";



  # Open mysqltest.log

  my $F= IO::File->new($path_timefile) or

    mtr_error("can't open file \"$path_timefile\": $!");

  my $F= IO::File->new($path_timefile)

    or return;

  my $reason;



  while ( my $line= <$F> )
@@ -3161,8 +3164,8 @@ sub analyze_testcase_failure($) 
  my ($tinfo)= @_;



  # Open mysqltest.log

  my $F= IO::File->new($path_timefile) or

    mtr_error("can't open file \"$path_timefile\": $!");

  my $F= IO::File->new($path_timefile)

    or return;



  while ( my $line= <$F> )

  {

mysql-test/r/mysqltest.result

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ here is the sourced script 


In loop

here is the sourced script

here is the sourced script

mysqltest: At line 1: Missing argument to sleep

mysqltest: At line 1: Missing argument to real_sleep

mysqltest: At line 1: Invalid argument to sleep "abc"