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 /libmysql | |
| 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)
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 2 insertions, 2 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)); |