Commit 53ac2613 authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Added back -max to server name if we are using InnoDB.

parent b737eb89

libmysql/libmysql.c

+2 −2
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, 
      else

      {

	cur->data[field] = to;

        if (len > end_to - to)

        if (len > (ulong) (end_to - to))

        {

          free_rows(result);

          net->last_errno=CR_UNKNOWN_ERROR;
@@ -998,7 +998,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) 
    }

    else

    {

      if (len > end_pos - pos)

      if (len > (ulong) (end_pos - pos))

      {

        mysql->net.last_errno=CR_UNKNOWN_ERROR;

        strmov(mysql->net.last_error,ER(mysql->net.last_errno));

sql/mysqld.cc

+3 −3
Original line number Diff line number Diff line
@@ -184,17 +184,17 @@ static char **opt_argv; 
#ifdef __WIN__

#undef MYSQL_SERVER_SUFFIX

#ifdef __NT__

#if defined(HAVE_BERKELEY_DB)

#if defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB)

#define MYSQL_SERVER_SUFFIX "-max-nt"

#else

#define MYSQL_SERVER_SUFFIX "-nt"

#endif /* ...DB */

#elif defined(HAVE_BERKELEY_DB)

#elif defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB)

#define MYSQL_SERVER_SUFFIX "-max"

#else

#define MYSQL_SERVER_SUFFIX ""

#endif /* __NT__ */

#endif

#endif /* __WIN__ */



#ifdef HAVE_BERKELEY_DB

SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_YES;