Commit e05bf277 authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

Final fixes for INSERT into MERGE tables. 

Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
parent 5d9be4de

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" 
cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-vio --with-openssl --with-embedded-server"

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server"



. "$path/FINISH.sh"

Docs/manual.texi

+175 −110

File changed.

Preview size limit exceeded, changes collapsed.

acinclude.m4

+6 −7
Original line number Diff line number Diff line
@@ -715,6 +715,8 @@ AC_MSG_CHECKING(for OpenSSL) 
              [openssl="$withval"],

              [openssl=no])



  openssl_libs=""

  openssl_includes=""

  if test "$openssl" = "yes"

  then

    if test -n "$vio_dir"
@@ -722,14 +724,12 @@ AC_MSG_CHECKING(for OpenSSL) 
      AC_MSG_RESULT(yes)

      openssl_libs="-L/usr/local/ssl/lib -lssl -lcrypto"

      openssl_includes="-I/usr/local/ssl/include"

      AC_DEFINE(HAVE_OPENSSL)

    else

      AC_MSG_ERROR([OpenSSL requires Virtual IO support (--with-vio)])

      AC_MSG_RESULT("disabled because --with-vio wasn't used")

    fi

    AC_DEFINE(HAVE_OPENSSL)

  else

    AC_MSG_RESULT(no)

    openssl_libs=""

    openssl_includes=""

  fi

  NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"

  AC_SUBST(openssl_libs)
@@ -748,16 +748,15 @@ dnl Call MYSQL_CHECK_ORBIT even if mysqlfs == no, so that @orbit_*@ 
dnl get substituted.

  MYSQL_CHECK_ORBIT



  fs_dirs=""

  if test "$mysqlfs" = "yes"

  then

    if test -n "$orbit_exec_prefix"

    then

      fs_dirs=fs

    else

      AC_MSG_ERROR([mysqlfs requires ORBit, the CORBA ORB])

      AC_MSG_RESULT("disabled because ORBIT, the CORBA ORB, wasn't found"])

    fi

  else

    fs_dirs=

  fi

  AC_SUBST([fs_dirs])

])

configure.in

+7 −3
Original line number Diff line number Diff line
@@ -1758,11 +1758,15 @@ AC_ARG_WITH(extra-tools, 
    [with_tools=yes]

)



tools_dirs=""

if test "$with_tools" = "yes"

then

  tools_dirs="tools"

  if test "$THREAD_SAFE_CLIENT" = "no"

  then

    echo "Warning: extra-tools disabled because --enable-thread-safe-client wasn't used"

  else

  tools_dirs=""

    tools_dirs="tools"

  fi

fi

AC_SUBST(tools_dirs)

include/mysql_com.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY, 
struct st_vio;					/* Only C */

typedef struct st_vio Vio;



#define MAX_BLOB_WIDTH		8192	// Default width for blob



typedef struct st_net {

  Vio* vio;

  my_socket fd;					/* For Perl DBI/dbd */