Commit c973f61a authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql

parents c65da53a 1f409baf

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -284,3 +284,4 @@ support-files/mysql.spec 
tags

tmp/*

sql-bench/gif/*

sql-bench/graph-compare-results

BitKeeper/etc/logging_ok

+2 −1
Original line number Diff line number Diff line 
heikki@donna.mysql.fi

jani@janikt.pp.saunalahti.fi

paul@teton.kitebird.com

monty@tik.mysql.fi

mwagner@evoq.mwagner.org

paul@teton.kitebird.com

Docs/manual.texi

+544 −50

File changed.

Preview size limit exceeded, changes collapsed.

isam/_dynrec.c

+1 −1
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ static int _nisam_cmp_buffer(File file, const byte *buff, ulong filepos, uint le 
  {

    if (my_read(file,temp_buff,next_length,MYF(MY_NABP)))

      goto err;

    if (memcmp((byte*) buff,temp_buff,IO_SIZE))

    if (memcmp((byte*) buff,temp_buff,next_length))

      DBUG_RETURN(1);

    buff+=next_length;

    length-= next_length;

myisam/mi_dynrec.c

+4 −5
Original line number Diff line number Diff line
@@ -1221,20 +1221,19 @@ static int _mi_cmp_buffer(File file, const byte *buff, my_off_t filepos, 
  char temp_buff[IO_SIZE*2];

  DBUG_ENTER("_mi_cmp_buffer");



  VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));

  next_length= IO_SIZE*2 - (uint) (filepos & (IO_SIZE-1));



  while (length > IO_SIZE*2)

  {

    if (my_read(file,temp_buff,next_length,MYF(MY_NABP)))

    if (my_pread(file,temp_buff,next_length,filepos, MYF(MY_NABP)) ||

	memcmp((byte*) buff,temp_buff,next_length))

      goto err;

    if (memcmp((byte*) buff,temp_buff,IO_SIZE))

      DBUG_RETURN(1);

    filepos+=next_length;

    buff+=next_length;

    length-= next_length;

    next_length=IO_SIZE*2;

  }

  if (my_read(file,temp_buff,length,MYF(MY_NABP)))

  if (my_pread(file,temp_buff,length,filepos,MYF(MY_NABP)))

    goto err;

  DBUG_RETURN(memcmp((byte*) buff,temp_buff,length));

err: