1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
monty@mashka.mysql.fi 2002-12-11 12:59:55 +02:00
parent b737eb89a7
commit 53ac261312
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmysql/libmysql.c
View File

@ -939,7 +939,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
else else
{ {
cur->data[field] = to; cur->data[field] = to;
if (len > end_to - to) if (len > (ulong) (end_to - to))
{ {
free_rows(result); free_rows(result);
net->last_errno=CR_UNKNOWN_ERROR; net->last_errno=CR_UNKNOWN_ERROR;
@ -998,7 +998,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths)
} }
else else
{ {
if (len > end_pos - pos) if (len > (ulong) (end_pos - pos))
{ {
mysql->net.last_errno=CR_UNKNOWN_ERROR; mysql->net.last_errno=CR_UNKNOWN_ERROR;
strmov(mysql->net.last_error,ER(mysql->net.last_errno)); strmov(mysql->net.last_error,ER(mysql->net.last_errno));

6
sql/mysqld.cc
View File

@ -184,17 +184,17 @@ static char **opt_argv;
#ifdef __WIN__ #ifdef __WIN__
#undef MYSQL_SERVER_SUFFIX #undef MYSQL_SERVER_SUFFIX
#ifdef __NT__ #ifdef __NT__
#if defined(HAVE_BERKELEY_DB) #if defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB)
#define MYSQL_SERVER_SUFFIX "-max-nt" #define MYSQL_SERVER_SUFFIX "-max-nt"
#else #else
#define MYSQL_SERVER_SUFFIX "-nt" #define MYSQL_SERVER_SUFFIX "-nt"
#endif /* ...DB */ #endif /* ...DB */
#elif defined(HAVE_BERKELEY_DB) #elif defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB)
#define MYSQL_SERVER_SUFFIX "-max" #define MYSQL_SERVER_SUFFIX "-max"
#else #else
#define MYSQL_SERVER_SUFFIX "" #define MYSQL_SERVER_SUFFIX ""
#endif /* __NT__ */ #endif /* __NT__ */
#endif #endif /* __WIN__ */
#ifdef HAVE_BERKELEY_DB #ifdef HAVE_BERKELEY_DB
SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_YES; SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_YES;