Commit 0d67738e authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

misc cleanup

parent 9db9b463

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -46872,6 +46872,8 @@ Added @code{slave-skip-errors} option 
Added statistics variables for all MySQL commands. (@code{SHOW STATUS} is

now much longer).

@item

Fixed default values for InnoDB tables.

@item

Fixed that @code{GROUP BY expr DESC} works.

@item

Fixed bug when using @code{t1 LEFT JOIN t2 ON t2.key=constant}.

include/my_bitmap.h

+3 −2
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ typedef struct st_bitmap 
  uchar *bitmap;

  uint bitmap_size;

  my_bool thread_safe; /* set if several threads access the bitmap */

  /* mutex will be acquired for the duration of each bitmap operation if

  /*

     mutex will be acquired for the duration of each bitmap operation if

     thread_safe flag is set. Otherwise, we optimize by not acquiring the

     mutex

   */

mysql-test/r/rpl_get_lock.result

+3 −1
Original line number Diff line number Diff line 
get_lock("lock",2)

1

release_lock("lock")

0

1

get_lock("lock",3)

1

n

mysql-test/t/rpl_get_lock.test

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ create table t1(n int); 
insert into t1 values(get_lock("lock",2));

dirty_close master;

connection master1;

select get_lock("lock",2);

select release_lock("lock");

save_master_pos;

connection slave;

mysys/my_bitmap.c

+4 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ my_bool bitmap_init(MY_BITMAP *map, uint bitmap_size, my_bool thread_safe) 
    return 1;

  dbug_assert(bitmap_size != ~(uint) 0);

#ifdef THREAD

  map->thread_safe = thread_safe;

  if ((map->thread_safe = thread_safe))

    pthread_mutex_init(&map->mutex, MY_MUTEX_INIT_FAST);

#endif

  map->bitmap_size=bitmap_size;
@@ -65,6 +65,7 @@ void bitmap_free(MY_BITMAP *map) 
    my_free((char*) map->bitmap, MYF(0));

    map->bitmap=0;

#ifdef THREAD

    if (map->thread_safe)

      pthread_mutex_destroy(&map->mutex);

#endif

  }