Commit c7eace29 authored by unknown's avatar unknown
Browse files

Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 

into arthur.local:/my/mysql-5.0-clean
parents fc202c06 91a76445

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

config/ac-macros/ha_federated.m4

0 → 100644
+29 −0
Original line number Diff line number Diff line 
dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_FEDERATED

dnl Sets HAVE_FEDERATED if --with-federated-storage-engine is used

dnl ---------------------------------------------------------------------------

AC_DEFUN([MYSQL_CHECK_FEDERATED], [

  AC_ARG_WITH([federated-storage-engine],

              [

  --with-federated-storage-engine

                        Enable the MySQL Storage Engine],

              [federateddb="$withval"],

              [federateddb=no])

  AC_MSG_CHECKING([for MySQL federated storage engine])



  case "$federateddb" in

    yes )

      AC_DEFINE([HAVE_FEDERATED_DB], [1], [Define to enable Federated Handler])

      AC_MSG_RESULT([yes])

      [federateddb=yes]

      ;;

    * )

      AC_MSG_RESULT([no])

      [federateddb=no]

      ;;

  esac



])

dnl ---------------------------------------------------------------------------

dnl END OF MYSQL_CHECK_FEDERATED SECTION

dnl ---------------------------------------------------------------------------

configure.in

+19 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ sinclude(config/ac-macros/compiler_flag.m4) 
sinclude(config/ac-macros/ha_archive.m4)

sinclude(config/ac-macros/ha_berkeley.m4)

sinclude(config/ac-macros/ha_example.m4)

sinclude(config/ac-macros/ha_federated.m4)

sinclude(config/ac-macros/ha_innodb.m4)

sinclude(config/ac-macros/ha_isam.m4)

sinclude(config/ac-macros/ha_ndbcluster.m4)
@@ -748,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
@@ -775,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

#--------------------------------------------------------------------
@@ -2420,6 +2437,7 @@ MYSQL_CHECK_EXAMPLEDB 
MYSQL_CHECK_ARCHIVEDB

MYSQL_CHECK_CSVDB

MYSQL_CHECK_NDBCLUSTER

MYSQL_CHECK_FEDERATED



# If we have threads generate some library functions and test programs

sql_server_dirs=

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 */