diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-11 12:59:55 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-11 12:59:55 +0200 |
| commit | 49162e0e54c085ecefb6893a5bd662e4f7b2f56a (patch) | |
| tree | 0a4f351d282a58c5c13fde6ecc0a5a9e829e4445 | |
| parent | 2076f2b44c30b696dc953b1809994fe5db6e4857 (diff) | |
| download | mariadb-git-49162e0e54c085ecefb6893a5bd662e4f7b2f56a.tar.gz | |
Added back -max to server name if we are using InnoDB.
libmysql/libmysql.c:
Compatibility fix
sql/mysqld.cc:
Added back -max if we are using InnoDB.
(This should not be done in the 3.23 version)
| -rw-r--r-- | libmysql/libmysql.c | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 9db1e1c9ab9..755d85dd04a 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -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)); diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0895013c37e..17cf8f79646 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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; |