mysql: Add Windows support

As the mysql_config script is not available for Windows, we use a hardcoded
library name and no additional CFLAGS. This builds fine against the binary
MySQL Connector/C distribution.
This commit is contained in:
Martin Willi
2014-06-04 15:53:04 +02:00
parent df4341747c
commit 8e1c0d15a9
3 changed files with 19 additions and 10 deletions
@@ -14,12 +14,12 @@
* for more details.
*/
#include "mysql_database.h"
#define _GNU_SOURCE
#include <string.h>
#include <mysql.h>
#include "mysql_database.h"
#include <utils/debug.h>
#include <utils/chunk.h>
#include <threading/thread_value.h>
@@ -730,7 +730,7 @@ static bool finalize_transaction(private_mysql_database_t *this,
return TRUE;
}
METHOD(database_t, commit, bool,
METHOD(database_t, commit_, bool,
private_mysql_database_t *this)
{
return finalize_transaction(this, FALSE);
@@ -768,7 +768,7 @@ static bool parse_uri(private_mysql_database_t *this, char *uri)
/**
* parse mysql://username:pass@host:port/database uri
*/
username = strdupa(uri + 8);
username = strdup(uri + 8);
pos = strchr(username, ':');
if (pos)
{
@@ -800,10 +800,12 @@ static bool parse_uri(private_mysql_database_t *this, char *uri)
this->password = strdup(password);
this->database = strdup(database);
this->port = atoi(port);
free(username);
return TRUE;
}
}
}
free(username);
DBG1(DBG_LIB, "parsing MySQL database uri '%s' failed", uri);
return FALSE;
}
@@ -828,7 +830,7 @@ mysql_database_t *mysql_database_create(char *uri)
.query = _query,
.execute = _execute,
.transaction = _transaction,
.commit = _commit,
.commit = _commit_,
.rollback = _rollback,
.get_driver = _get_driver,
.destroy = _destroy,