Commit b096c34d authored by unknown's avatar unknown
Browse files

merged changes from 4.1 


include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
parents c273526d 67c5514b

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#endif /* __CYGWIN__ */



/* Determine when to use "#pragma interface" */

#if !defined(__CYGWIN__) && !defined(__ICC) && defined(__GNUC__) && (__GNUC__ < 3)

#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

#define USE_PRAGMA_INTERFACE

#endif

myisammrg/myrg_open.c

+3 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
  while ((length=my_b_gets(&file,buff,FN_REFLEN-1)))

  {

    if ((end=buff+length)[-1] == '\n')

      end[-1]='\0';

      *--end='\0';

    if (!buff[0])

      continue;		/* Skip empty lines */

    if (buff[0] == '#')
@@ -86,6 +86,8 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
                   sizeof(name_buff)-1-dir_length));

      VOID(cleanup_dirname(buff,name_buff));

    }

    else

      fn_format(buff, buff, "", "", 0);

    if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0))))

      goto err;

    if (!m_info)                                /* First file */

mysys/my_getwd.c

+4 −1
Original line number Diff line number Diff line
@@ -209,6 +209,9 @@ int test_if_hard_path(register const char *dir_name) 
my_bool has_path(const char *name)

{

  return test(strchr(name, FN_LIBCHAR)) 

#if FN_LIBCHAR != '/'

    || test(strchr(name,'/'))

#endif

#ifdef FN_DEVCHAR

    || test(strchr(name, FN_DEVCHAR))

#endif

ndb/src/cw/cpcd/Process.cpp

+1 −4
Original line number Diff line number Diff line
@@ -223,11 +223,8 @@ set_ulimit(const BaseString & pair){ 
  if(!(list[1].trim() == "unlimited")){

    value = atoi(list[1].c_str());

  }

#if defined(__INTEL_COMPILER)

  struct rlimit64 rlp;

#else



  struct rlimit rlp;

#endif

#define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }}

  

  if(list[0].trim() == "c"){

strings/my_vsnprintf.c

+1 −1

File changed.

Contains only whitespace changes.