Commit 8e2650ab 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


include/my_sys.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 339a7085 d50ae165

include/my_base.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ enum ha_base_keytype { 
#define HA_VAR_LENGTH_KEY	 8

#define HA_NULL_PART_KEY	 64

#define HA_USES_PARSER           16384  /* Fulltext index uses [pre]parser */

#define HA_USES_BLOCK_SIZE	 ((uint) 32768)

#define HA_SORT_ALLOWS_SAME      512    /* Intern bit when sorting records */

/*

  Key has a part that can have end space.  If this is an unique key

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -817,6 +817,7 @@ extern int unpackfrm(const void **, uint *, const void *); 


extern ha_checksum my_checksum(ha_checksum crc, const byte *mem, uint count);

extern uint my_bit_log2(ulong value);

extern uint32 my_round_up_to_next_power(uint32 v);

extern uint my_count_bits(ulonglong v);

extern uint my_count_bits_ushort(ushort v);

extern void my_sleep(ulong m_seconds);

include/myisam.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ typedef struct st_mi_keydef /* Key definition with open & info */ 
  uint16 keylength;			/* Tot length of keyparts (auto) */

  uint16 minlength;			/* min length of (packed) key (auto) */

  uint16 maxlength;			/* max length of (packed) key (auto) */

  uint16 block_size;			/* block_size (auto) */

  uint16 block_size_index;		/* block_size (auto) */

  uint32 version;			/* For concurrent read/write */

  uint32 ftparser_nr;                   /* distinct ftparser number */

include/violite.h

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ struct st_VioSSLAcceptorFd 
		      const char *ca_file,const char *ca_path,

		      const char *cipher);

Vio *new_VioSSL(struct st_VioSSLAcceptorFd *fd, Vio *sd, int state);

void free_vio_ssl_acceptor_fd(struct st_VioSSLAcceptorFd *fd);

#endif /* HAVE_OPENSSL */



#ifdef HAVE_SMEM

mysql-test/mysql-test-run.pl

+15 −12
Original line number Diff line number Diff line
@@ -1224,6 +1224,8 @@ sub environment_setup () { 
  $ENV{MTR_BUILD_THREAD}= 0 unless $ENV{MTR_BUILD_THREAD}; # Set if not set



  # We are nice and report a bit about our settings

  if (!$opt_extern)

  {

    print "Using MTR_BUILD_THREAD      = $ENV{MTR_BUILD_THREAD}\n";

    print "Using MASTER_MYPORT         = $ENV{MASTER_MYPORT}\n";

    print "Using MASTER_MYPORT1        = $ENV{MASTER_MYPORT1}\n";
@@ -1236,6 +1238,7 @@ sub environment_setup () { 
    print "Using IM_MYSQLD1_PORT       = $ENV{IM_MYSQLD1_PORT}\n";

    print "Using IM_MYSQLD2_PORT       = $ENV{IM_MYSQLD2_PORT}\n";

  }

}





##############################################################################
@@ -1399,7 +1402,7 @@ sub check_running_as_root () { 


sub check_ssl_support () {



  if ($opt_skip_ssl)

  if ($opt_skip_ssl || $opt_extern)

  {

    mtr_report("Skipping SSL");

    $opt_ssl_supported= 0;