Commit 1577b63a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/my/mysql-5.0 

into mysql.com:/space/my/mysql-5.0-build
parents b9989337 fcd2732d

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ joerg@mysql.com 
joreland@mysql.com

jorge@linux.jorge.mysql.com

jplindst@t41.(none)

kaa@polly.local

kaj@work.mysql.com

kent@mysql.com

konstantin@mysql.com

configure.in

+17 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \ 
 strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \

 sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \

 unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h \

 sys/ioctl.h malloc.h sys/malloc.h linux/config.h)

 sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h linux/config.h)



#--------------------------------------------------------------------

# Check for system libraries. Adds the library to $LIBS
@@ -776,6 +776,22 @@ AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) 
AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))

MYSQL_CHECK_ZLIB_WITH_COMPRESS



# For large pages support

if test "$IS_LINUX" = "true"

then

  # For SHM_HUGETLB on Linux

  AC_CHECK_DECLS(SHM_HUGETLB, 

      AC_DEFINE([HAVE_LARGE_PAGES], [1], 

                [Define if you have large pages support])

      AC_DEFINE([HUGETLB_USE_PROC_MEMINFO], [1],

                [Define if /proc/meminfo shows the huge page size (Linux only)])

      , ,

      [

#include <sys/shm.h>

      ]

  )

fi



#--------------------------------------------------------------------

# Check for TCP wrapper support

#--------------------------------------------------------------------

include/m_ctype.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ enum my_lex_states 
{

  MY_LEX_START, MY_LEX_CHAR, MY_LEX_IDENT, 

  MY_LEX_IDENT_SEP, MY_LEX_IDENT_START,

  MY_LEX_REAL, MY_LEX_HEX_NUMBER,

  MY_LEX_REAL, MY_LEX_HEX_NUMBER, MY_LEX_BIN_NUMBER,

  MY_LEX_CMP_OP, MY_LEX_LONG_CMP_OP, MY_LEX_STRING, MY_LEX_COMMENT, MY_LEX_END,

  MY_LEX_OPERATOR_OR_IDENT, MY_LEX_NUMBER_IDENT, MY_LEX_INT_OR_REAL,

  MY_LEX_REAL_OR_POINT, MY_LEX_BOOL, MY_LEX_EOL, MY_LEX_ESCAPE,

include/my_base.h

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ enum ha_base_keytype { 
  HA_KEYTYPE_UINT24=13,

  HA_KEYTYPE_INT8=14,

  HA_KEYTYPE_VARTEXT=15,		/* Key is sorted as letters */

  HA_KEYTYPE_VARBINARY=16		/* Key is sorted as unsigned chars */

  HA_KEYTYPE_VARBINARY=16,		/* Key is sorted as unsigned chars */

  HA_KEYTYPE_BIT=17

};



#define HA_MAX_KEYTYPE	31		/* Must be log2-1 */

include/my_handler.h

+17 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ typedef struct st_HA_KEYSEG /* Key-portion */ 
  uint32 start;				/* Start of key in record */

  uint32 null_pos;			/* position to NULL indicator */

  CHARSET_INFO *charset;

  uint8 bit_length;                     /* Length of bit part */

  uint16 bit_pos;                       /* Position to bit part */

} HA_KEYSEG;



#define get_key_length(length,key) \
@@ -64,6 +66,21 @@ typedef struct st_HA_KEYSEG /* Key-portion */ 
  { *(key)=255; mi_int2store((key)+1,(length)); (key)+=3; } \

}



#define get_rec_bits(bit_ptr, bit_ofs, bit_len) \

  (((((uint16) (bit_ptr)[1] << 8) | (uint16) (bit_ptr)[0]) >> (bit_ofs)) & \

   ((1 << (bit_len)) - 1))



#define set_rec_bits(bits, bit_ptr, bit_ofs, bit_len) \

{ \

  (bit_ptr)[0]= ((bit_ptr)[0] & ((1 << (bit_ofs)) - 1)) | \

                ((bits) << (bit_ofs)); \

  if ((bit_ofs) + (bit_len) > 8) \

    (bit_ptr)[1]= ((bits) & ((1 << (bit_len)) - 1)) >> (8 - (bit_ofs)); \

}



#define clr_rec_bits(bit_ptr, bit_ofs, bit_len) \

  set_rec_bits(0, bit_ptr, bit_ofs, bit_len)



extern int mi_compare_text(CHARSET_INFO *, uchar *, uint, uchar *, uint ,

			   my_bool, my_bool);

extern int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a,