Commit 92a8bd93 authored by unknown's avatar unknown
Browse files

manually merged 


innobase/dict/dict0dict.c:
  merged (ul)
innobase/include/dict0dict.h:
  merged (ul)
sql/ha_innodb.cc:
  merged (ul)
sql/log.cc:
  automerged
parents 7a60d155 c486461e

sql/log.cc

+10 −8
Original line number Diff line number Diff line
@@ -2036,6 +2036,7 @@ bool flush_error_log() 
    char err_renamed[FN_REFLEN], *end;

    end= strmake(err_renamed,log_error_file,FN_REFLEN-4);

    strmov(end, "-old");

    VOID(pthread_mutex_lock(&LOCK_error_log));

#ifdef __WIN__

    char err_temp[FN_REFLEN+4];

    /*
@@ -2056,7 +2057,7 @@ bool flush_error_log() 
      if ((fd = my_open(err_temp, O_RDONLY, MYF(0))) >= 0)

      {

        while ((bytes = (int) my_read(fd, (byte*) buf, IO_SIZE, MYF(0))) > 0)

             my_fwrite(stderr, (byte*) buf, (uint) strlen(buf),MYF(0));

             my_fwrite(stderr, (byte*) buf, bytes, MYF(0));

        my_close(fd, MYF(0));

      }

      (void) my_delete(err_temp, MYF(0));
@@ -2070,6 +2071,7 @@ bool flush_error_log() 
    else

      result= 1;

#endif

    VOID(pthread_mutex_unlock(&LOCK_error_log));

  }

   return result;

}

sql/sql_class.cc

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ static File create_file(THD *thd, char *path, sql_exchange *exchange, 
    return -1;

  }

  /* Create the file world readable */

  if ((file= my_create(path, 0666, O_WRONLY, MYF(MY_WME))) < 0)

  if ((file= my_create(path, 0666, O_WRONLY|O_EXCL, MYF(MY_WME))) < 0)

    return file;

#ifdef HAVE_FCHMOD

  (void) fchmod(file, 0666);			// Because of umask()