Commit 122167bb authored by svoj@mysql.com/june.mysql.com's avatar svoj@mysql.com/june.mysql.com
Browse files

Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
parents b7894527 8a809def

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define MY_ALLOW_ZERO_PTR 64	/* my_realloc() ; zero ptr -> malloc */

#define MY_FREE_ON_ERROR 128	/* my_realloc() ; Free old ptr on error */

#define MY_HOLD_ON_ERROR 256	/* my_realloc() ; Return old ptr on error */

#define MY_THREADSAFE	128	/* pread/pwrite:  Don't allow interrupts */

#define MY_DONT_OVERWRITE_FILE 1024	/* my_copy: Don't overwrite file */

#define MY_THREADSAFE 2048      /* my_seek(): lock fd mutex */



#define MY_CHECK_ERROR	1	/* Params to my_end; Check open-close */

#define MY_GIVE_INFO	2	/* Give time info about process*/

myisam/mi_check.c

+7 −6
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ int chk_size(MI_CHECK *param, register MI_INFO *info) 
  flush_key_blocks(info->s->key_cache,

		   info->s->kfile, FLUSH_FORCE_WRITE);



  size=my_seek(info->s->kfile,0L,MY_SEEK_END,MYF(0));

  size= my_seek(info->s->kfile, 0L, MY_SEEK_END, MYF(MY_THREADSAFE));

  if ((skr=(my_off_t) info->state->key_file_length) != size)

  {

    /* Don't give error if file generated by myisampack */
@@ -595,7 +595,8 @@ static int chk_index_down(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo, 
  {

    /* purecov: begin tested */

    /* Give it a chance to fit in the real file size. */

    my_off_t max_length= my_seek(info->s->kfile, 0L, MY_SEEK_END, MYF(0));

    my_off_t max_length= my_seek(info->s->kfile, 0L, MY_SEEK_END,

                                 MYF(MY_THREADSAFE));

    mi_check_print_error(param, "Invalid key block position: %s  "

                         "key block size: %u  file_length: %s",

                         llstr(page, llbuff), keyinfo->block_length,
@@ -4052,10 +4053,10 @@ int test_if_almost_full(MI_INFO *info) 
{

  if (info->s->options & HA_OPTION_COMPRESS_RECORD)

    return 0;

  return (my_seek(info->s->kfile,0L,MY_SEEK_END,MYF(0))/10*9 >

	  (my_off_t) (info->s->base.max_key_file_length) ||

  return my_seek(info->s->kfile, 0L, MY_SEEK_END, MYF(MY_THREADSAFE)) / 10 * 9 >

         (my_off_t) info->s->base.max_key_file_length ||

         my_seek(info->dfile, 0L, MY_SEEK_END, MYF(0)) / 10 * 9 >

	  (my_off_t) info->s->base.max_data_file_length);

         (my_off_t) info->s->base.max_data_file_length;

}



	/* Recreate table with bigger more alloced record-data */

mysql-test/r/blackhole.result

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,10 @@ master-bin.000001 # Query 1 # use `test`; create table t3 like t1 
master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t3

master-bin.000001	#	Query	1	#	use `test`; replace into t1 select * from t3

drop table t1,t2,t3;

CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;

INSERT DELAYED INTO t1 VALUES(1);

ERROR HY000: Table storage engine for 't1' doesn't have this option

DROP TABLE t1;

CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE;

DELETE FROM t1 WHERE a=10;

ALTER TABLE t1 ADD INDEX(a);

mysql-test/t/blackhole.test

+12 −1
Original line number Diff line number Diff line
@@ -127,6 +127,17 @@ show binlog events; 


drop table t1,t2,t3;



#

# BUG#27998 - mysqld crashed when executing INSERT DELAYED on a BLACKHOLE

#             table

#

CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;

--error 1031

INSERT DELAYED INTO t1 VALUES(1);

DROP TABLE t1;



# End of 4.1 tests



#

#Bug#19717: DELETE Query Error on BLACKHOLE when using WHERE on column with UNIQUE INDEX

#
@@ -142,4 +153,4 @@ ALTER TABLE t1 ADD PRIMARY KEY(a); 
DELETE FROM t1 WHERE a=10;

DROP TABLE t1;



# End of 4.1 tests
 
# End of 5.0 tests

mysys/my_seek.c

+13 −4
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
  my_off_t pos     The expected position (absolute or relative)

  int whence       A direction parameter and one of 

                   {SEEK_SET, SEEK_CUR, SEEK_END}

  myf MyFlags      Not used.

  myf MyFlags      MY_THREADSAFE must be set in case my_seek may be mixed

                   with my_pread/my_pwrite calls and fd is shared among

                   threads.



  DESCRIPTION

    The my_seek  function  is a wrapper around the system call lseek and
@@ -54,9 +56,16 @@ my_off_t my_seek(File fd, my_off_t pos, int whence, 
      Make sure we are using a valid file descriptor!

  */

  DBUG_ASSERT(fd != -1);



#if defined(THREAD) && !defined(HAVE_PREAD)

  if (MyFlags & MY_THREADSAFE)

  {

    pthread_mutex_lock(&my_file_info[fd].mutex);

    newpos= lseek(fd, pos, whence);

    pthread_mutex_unlock(&my_file_info[fd].mutex);

  }

  else

#endif

    newpos= lseek(fd, pos, whence);

  

  if (newpos == (os_off_t) -1)

  {

    my_errno=errno;