diff options
| author | Martin Willi <martin@strongswan.org> | 2008-06-24 14:30:14 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-06-24 14:30:14 +0000 |
| commit | fae6e24dad0c3ac90399a2082a6bba9c0ea206d8 (patch) | |
| tree | 20bff45d1af433069d389c8bcbc9647c430f9a2b /src/libstrongswan/plugins/mysql/mysql_database.c | |
| parent | a02bc1dbeadeb5d0e5243059f6212e03c70a68fb (diff) | |
| download | strongswan-fae6e24dad0c3ac90399a2082a6bba9c0ea206d8.tar.bz2 strongswan-fae6e24dad0c3ac90399a2082a6bba9c0ea206d8.tar.xz | |
reintroducing MYSQL_DATA_TRUNCATED if supported on that mysql version
Diffstat (limited to 'src/libstrongswan/plugins/mysql/mysql_database.c')
| -rw-r--r-- | src/libstrongswan/plugins/mysql/mysql_database.c | 7 |
1 files changed, 7 insertions, 0 deletions
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 <utils/mutex.h> #include <utils/linked_list.h> +/* 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; |