Commit 9a420a4f authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.0/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents afc85273 f49cf0f2

include/my_global.h

+3 −0
Original line number Diff line number Diff line
@@ -500,6 +500,9 @@ typedef SOCKET_SIZE_TYPE size_socket; 
#ifndef O_SHORT_LIVED

#define O_SHORT_LIVED	0

#endif

#ifndef O_NOFOLLOW

#define O_NOFOLLOW      0

#endif



/* #define USE_RECORD_LOCK	*/

isam/create.c

+3 −2
Original line number Diff line number Diff line
@@ -58,13 +58,14 @@ int nisam_create(const char *name,uint keys,N_KEYDEF *keyinfo, 
  base_pos=512;					/* Enough for N_STATE_INFO */

  bzero((byte*) &share,sizeof(share));

  if ((file = my_create(fn_format(buff,name,"",N_NAME_IEXT,4),0,

       O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)

       O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0)

    goto err;

  errpos=1;

  VOID(fn_format(buff,name,"",N_NAME_DEXT,2+4));

  if (!(flags & HA_DONT_TOUCH_DATA))

  {

    if ((dfile = my_create(buff,0,O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)

    if ((dfile = my_create(buff,0,O_RDWR | O_EXCL | O_NOFOLLOW,

                           MYF(MY_WME))) < 0)

      goto err;

    errpos=2;

  }

merge/mrg_create.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int mrg_create(const char *name, const char**table_names) 


  errpos=0;

  if ((file = my_create(fn_format(buff,name,"",MRG_NAME_EXT,4),0,

       O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)

       O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0)

    goto err;

  errpos=1;

  if (table_names)

myisam/mi_create.c

+8 −8
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
{

  register uint i,j;

  File dfile,file;

  int errpos,save_errno;

  int errpos,save_errno, create_mode= O_RDWR | O_TRUNC;

  myf create_flag;

  uint fields,length,max_key_length,packed,pointer,

       key_length,info_length,key_segs,options,min_key_length_skipp,
@@ -174,7 +174,10 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
    min_pack_length+=varchar_length+2*varchar_count;

  }

  if (flags & HA_CREATE_TMP_TABLE)

  {

    options|= HA_OPTION_TMP_TABLE;

    create_mode|= O_EXCL | O_NOFOLLOW;

  }

  if (flags & HA_CREATE_CHECKSUM || (options & HA_OPTION_CHECKSUM))

  {

    options|= HA_OPTION_CHECKSUM;
@@ -508,9 +511,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
    create_flag=MY_DELETE_OLD;

  }



  if ((file= my_create_with_symlink(linkname_ptr,

				    filename,

				    0, O_RDWR | O_TRUNC,

  if ((file= my_create_with_symlink(linkname_ptr, filename, 0, create_mode,

				    MYF(MY_WME | create_flag))) < 0)

    goto err;

  errpos=1;
@@ -521,7 +522,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
    if (share.base.raid_type)

    {

      (void) fn_format(filename,name,"",MI_NAME_DEXT,2+4);

      if ((dfile=my_raid_create(filename,0,O_RDWR | O_TRUNC,

      if ((dfile=my_raid_create(filename, 0, create_mode

				share.base.raid_type,

				share.base.raid_chunks,

				share.base.raid_chunksize,
@@ -545,8 +546,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
	create_flag=MY_DELETE_OLD;

      }

      if ((dfile=

	   my_create_with_symlink(linkname_ptr, filename,

				  0,O_RDWR | O_TRUNC,

	   my_create_with_symlink(linkname_ptr, filename, 0, create_mode,

				  MYF(MY_WME | create_flag))) < 0)

	goto err;

    }

myisammrg/myrg_create.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int myrg_create(const char *name, const char **table_names, 


  errpos=0;

  if ((file = my_create(fn_format(buff,name,"",MYRG_NAME_EXT,4),0,

       O_RDWR | O_TRUNC,MYF(MY_WME))) < 0)

       O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0)

    goto err;

  errpos=1;

  if (table_names)