Commit 26fe4bf9 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


mysql-test/t/mysqldump.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_table.cc:
  After merge fix
sql/sql_show.cc:
  Auto merged
parents 462a43e1 3c099551

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/lib/mtr_report.pl

+3 −1
Original line number Diff line number Diff line
@@ -217,7 +217,9 @@ sub mtr_report_stats ($) { 
      my $found_problems= 0;            # Some warnings are errors...



      # We report different types of problems in order

      foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x" )

      foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x",

			    "InnoDB: Warning", "missing DBUG_RETURN",

			    "mysqld: Warning")

      {

        foreach my $errlog ( sort glob("$::opt_vardir/log/*.err") )

        {