Commit 555eb848 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
include/heap.h:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
unittest/mysys/base64-t.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/t/innodb_mysql.test:
  manual merge
mysql-test/valgrind.supp:
  manual merge
sql/event.cc:
  manual merge
sql/ha_heap.cc:
  manual merge
sql/ha_myisam.cc:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster_binlog.cc:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/handler.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/handler.h:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/item.h:
  automatic merge
sql/item_cmpfunc.cc:
  automatic merge
sql/log_event.cc:
  manual merge
  Trivial cleanup
sql/mysql_priv.h:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/opt_range.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_delete.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_insert.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_load.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_select.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_show.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_table.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_update.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/table.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
storage/blackhole/ha_blackhole.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
storage/csv/ha_tina.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
mysql-test/valgrind.supp.orig:
  Manual merge
parents 14e1d69a 01d03e7b

.bzrignore

+4 −3
Original line number Diff line number Diff line 
*-t

*.a

*.bb

*.bbg
@@ -458,6 +459,7 @@ libmysqld/emb_qcache.cpp 
libmysqld/errmsg.c

libmysqld/event.cc

libmysqld/event_executor.cc

libmysqld/event_scheduler.cc

libmysqld/event_timed.cc

libmysqld/examples/client_test.c

libmysqld/examples/client_test.cc
@@ -788,6 +790,8 @@ mysys/main.cc 
mysys/my_new.cpp

mysys/raid.cpp

mysys/ste5KbMa

mysys/test_atomic

mysys/test_bitmap

mysys/test_charset

mysys/test_dir

mysys/test_gethwaddr
@@ -1770,6 +1774,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
libmysqld/event_scheduler.cc

mysys/test_atomic

*-t

include/base64.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
extern "C" {

#endif



#include <my_global.h>



/*

  Calculate how much memory needed for dst of base64_encode()

*/

include/heap.h

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ extern int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
extern int heap_delete_table(const char *name);

extern void heap_drop_table(HP_INFO *info);

extern int heap_extra(HP_INFO *info,enum ha_extra_function function);

extern int heap_reset(HP_INFO *info);

extern int heap_rename(const char *old_name,const char *new_name);

extern int heap_panic(enum ha_panic_function flag);

extern int heap_rsame(HP_INFO *info,byte *record,int inx);

include/my_base.h

+1 −10
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ enum ha_key_alg { 
enum ha_extra_function {

  HA_EXTRA_NORMAL=0,			/* Optimize for space (def) */

  HA_EXTRA_QUICK=1,			/* Optimize for speed */

  HA_EXTRA_RESET=2,			/* Reset database to after open */

  HA_EXTRA_NOT_USED=2,

  HA_EXTRA_CACHE=3,			/* Cache record in HA_rrnd() */

  HA_EXTRA_NO_CACHE=4,			/* End caching of records (def) */

  HA_EXTRA_NO_READCHECK=5,		/* No readcheck on update */
@@ -128,15 +128,6 @@ enum ha_extra_function { 
  HA_EXTRA_RESET_STATE,			/* Reset positions */

  HA_EXTRA_IGNORE_DUP_KEY,		/* Dup keys don't rollback everything*/

  HA_EXTRA_NO_IGNORE_DUP_KEY,

  /*

    Instructs InnoDB to retrieve all columns (except in key read), not just

    those where field->query_id is the same as the current query id

  */

  HA_EXTRA_RETRIEVE_ALL_COLS,

  /*

    Instructs InnoDB to retrieve at least all the primary key columns

  */

  HA_EXTRA_RETRIEVE_PRIMARY_KEY,

  HA_EXTRA_PREPARE_FOR_DELETE,

  HA_EXTRA_PREPARE_FOR_UPDATE,		/* Remove read cache if problems */

  HA_EXTRA_PRELOAD_BUFFER_SIZE,         /* Set buffer size for preloading */

include/my_bitmap.h

+31 −22
Original line number Diff line number Diff line
@@ -17,19 +17,18 @@ 
#ifndef _my_bitmap_h_

#define _my_bitmap_h_



#ifdef THREAD

#include <my_pthread.h>

#endif



#define MY_BIT_NONE (~(uint) 0)



#include <m_string.h>



typedef uint32 my_bitmap_map;



typedef struct st_bitmap

{

  uint32 *bitmap;

  my_bitmap_map *bitmap;

  uint n_bits; /* number of bits occupied by the above */

  uint32 last_word_mask;

  uint32 *last_word_ptr;

  my_bitmap_map last_word_mask;

  my_bitmap_map *last_word_ptr;

  /*

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

     thread_safe flag in bitmap_init was set.  Otherwise, we optimize by not
@@ -43,12 +42,16 @@ typedef struct st_bitmap 
#ifdef	__cplusplus

extern "C" {

#endif

extern my_bool bitmap_init(MY_BITMAP *map, uint32 *buf, uint n_bits, my_bool thread_safe);

extern my_bool bitmap_init(MY_BITMAP *map, my_bitmap_map *buf, uint n_bits,

                           my_bool thread_safe);

extern my_bool bitmap_is_clear_all(const MY_BITMAP *map);

extern my_bool bitmap_is_prefix(const MY_BITMAP *map, uint prefix_size);

extern my_bool bitmap_is_set_all(const MY_BITMAP *map);

extern my_bool bitmap_is_subset(const MY_BITMAP *map1, const MY_BITMAP *map2);

extern my_bool bitmap_is_overlapping(const MY_BITMAP *map1,

                                     const MY_BITMAP *map2);

extern my_bool bitmap_test_and_set(MY_BITMAP *map, uint bitmap_bit);

extern my_bool bitmap_test_and_clear(MY_BITMAP *map, uint bitmap_bit);

extern my_bool bitmap_fast_test_and_set(MY_BITMAP *map, uint bitmap_bit);

extern uint bitmap_set_next(MY_BITMAP *map);

extern uint bitmap_get_first(const MY_BITMAP *map);
@@ -62,6 +65,7 @@ extern void bitmap_subtract(MY_BITMAP *map, const MY_BITMAP *map2); 
extern void bitmap_union(MY_BITMAP *map, const MY_BITMAP *map2);

extern void bitmap_xor(MY_BITMAP *map, const MY_BITMAP *map2);

extern void bitmap_invert(MY_BITMAP *map);

extern void bitmap_copy(MY_BITMAP *map, const MY_BITMAP *map2);



extern uint bitmap_lock_set_next(MY_BITMAP *map);

extern void bitmap_lock_clear_bit(MY_BITMAP *map, uint bitmap_bit);
@@ -88,7 +92,7 @@ extern void bitmap_lock_xor(MY_BITMAP *map, const MY_BITMAP *map2); 
extern void bitmap_lock_invert(MY_BITMAP *map);

#endif

/* Fast, not thread safe, bitmap functions */

#define bitmap_buffer_size(bits) 4*(((bits)+31)/32);

#define bitmap_buffer_size(bits) (((bits)+31)/32)*4

#define no_bytes_in_map(map) (((map)->n_bits + 7)/8)

#define no_words_in_map(map) (((map)->n_bits + 31)/32)

#define bytes_word_aligned(bytes) (4*((bytes + 3)/4))
@@ -98,28 +102,28 @@ extern void bitmap_lock_invert(MY_BITMAP *map); 
                                  ^= (1 << ((BIT) & 7)))

#define _bitmap_clear_bit(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \

                                  &= ~ (1 << ((BIT) & 7)))

#define _bitmap_is_set(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \

#define _bitmap_is_set(MAP, BIT) (uint) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \

                                         & (1 << ((BIT) & 7)))

#ifndef DBUG_OFF

static inline uint32

static inline void

bitmap_set_bit(MY_BITMAP *map,uint bit)

{

  DBUG_ASSERT(bit < (map)->n_bits);

  return _bitmap_set_bit(map,bit);

  _bitmap_set_bit(map,bit);

}

static inline uint32

static inline void

bitmap_flip_bit(MY_BITMAP *map,uint bit)

{

  DBUG_ASSERT(bit < (map)->n_bits);

  return _bitmap_flip_bit(map,bit);

  _bitmap_flip_bit(map,bit);

}

static inline uint32

static inline void

bitmap_clear_bit(MY_BITMAP *map,uint bit)

{

  DBUG_ASSERT(bit < (map)->n_bits);

  return _bitmap_clear_bit(map,bit);

  _bitmap_clear_bit(map,bit);

}

static inline uint32

static inline uint

bitmap_is_set(const MY_BITMAP *map,uint bit)

{

  DBUG_ASSERT(bit < (map)->n_bits);
@@ -131,11 +135,16 @@ bitmap_is_set(const MY_BITMAP *map,uint bit) 
#define bitmap_clear_bit(MAP, BIT) _bitmap_clear_bit(MAP, BIT)

#define bitmap_is_set(MAP, BIT) _bitmap_is_set(MAP, BIT)

#endif

#define bitmap_cmp(MAP1, MAP2) \

  (memcmp((MAP1)->bitmap, (MAP2)->bitmap, 4*no_words_in_map((MAP1)))==0)



static inline my_bool bitmap_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2)

{

  *(map1)->last_word_ptr|= (map1)->last_word_mask;

  *(map2)->last_word_ptr|= (map2)->last_word_mask;

  return memcmp((map1)->bitmap, (map2)->bitmap, 4*no_words_in_map((map1)))==0;

}



#define bitmap_clear_all(MAP) \

  { memset((MAP)->bitmap, 0, 4*no_words_in_map((MAP))); \

  *(MAP)->last_word_ptr|= (MAP)->last_word_mask; }

  { memset((MAP)->bitmap, 0, 4*no_words_in_map((MAP))); }

#define bitmap_set_all(MAP) \

  (memset((MAP)->bitmap, 0xFF, 4*no_words_in_map((MAP))))