From fae6e24dad0c3ac90399a2082a6bba9c0ea206d8 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 24 Jun 2008 14:30:14 +0000 Subject: reintroducing MYSQL_DATA_TRUNCATED if supported on that mysql version --- src/libstrongswan/plugins/mysql/mysql_database.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/libstrongswan/plugins/mysql/mysql_database.c') diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c index 942800a88..530ff5dd4 100644 --- a/src/libstrongswan/plugins/mysql/mysql_database.c +++ b/src/libstrongswan/plugins/mysql/mysql_database.c @@ -26,6 +26,12 @@ #include #include +/* Older mysql.h headers do not define it, but we need it. It is not returned + * in in MySQL 4 by default, but by MySQL 5. To avoid this problem, we catch + * it in all cases. */ +#ifdef MYSQL_DATA_TRUNCATED +#define MYSQL_DATA_TRUNCATED 101 +#endif typedef struct private_mysql_database_t private_mysql_database_t; @@ -407,6 +413,7 @@ static bool mysql_enumerator_enumerate(mysql_enumerator_t *this, ...) switch (mysql_stmt_fetch(this->stmt)) { case 0: + case MYSQL_DATA_TRUNCATED: break; case MYSQL_NO_DATA: return FALSE; -- cgit v1.2.3