diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-03 13:18:32 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-03 13:18:32 +0000 |
| commit | 1a5dab8037c33f0188df86ab56eeab09c0c5a5ef (patch) | |
| tree | 5b362fa00856105c99a8b66a6e3c8138599ea131 /src/libs/zbxdb/db.c | |
| parent | 25af20831b6371c35563dbf087f873c3518cb86b (diff) | |
| download | zabbix-1a5dab8037c33f0188df86ab56eeab09c0c5a5ef.tar.gz zabbix-1a5dab8037c33f0188df86ab56eeab09c0c5a5ef.tar.xz zabbix-1a5dab8037c33f0188df86ab56eeab09c0c5a5ef.zip | |
- fixed support of 'curl' library (Eugene)
- added suport of 'automake' v1.6 (Eugene)
- fixed oracle support (Eugene)
- added support of MySQL v3.23 (Eugene)
- fixed 'gen.pl' for UTF8 (Eugene)
- more minor fixes
git-svn-id: svn://svn.zabbix.com/trunk@3971 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxdb/db.c')
| -rw-r--r-- | src/libs/zbxdb/db.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c index 2799cdce..9b3c9959 100644 --- a/src/libs/zbxdb/db.c +++ b/src/libs/zbxdb/db.c @@ -98,12 +98,14 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d if(ZBX_DB_OK == ret) { +#ifdef HAVE_MYSQL_AUTOCOMMIT if(mysql_autocommit(conn, 1) != 0) { zabbix_log(LOG_LEVEL_ERR, "Failed to set autocommit to 1: Error: %s [%d]", mysql_error(conn), mysql_errno(conn)); ret = ZBX_DB_FAIL; } +#endif /* HAVE_MYSQL_AUTOCOMMIT */ } if(ZBX_DB_FAIL == ret) @@ -155,7 +157,7 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d } sqlo_autocommit_on(oracle); - return ret + return ret; #endif #ifdef HAVE_SQLITE3 ret = sqlite3_open(dbname, &conn); @@ -539,7 +541,7 @@ DB_ROW zbx_db_fetch(DB_RESULT result) if(SQLO_SUCCESS == res) { - return sqlo_values(result, NULL, 1); + return (DB_ROW)sqlo_values(result, NULL, 1); } else if(SQLO_NO_DATA == res) { @@ -743,7 +745,7 @@ zbx_uint64_t zbx_db_insert_id(int exec_result, const char *table, const char *fi zbx_snprintf(sql, sizeof(sql), "select %s_%s.currval from dual", table, field); - resulr=DBselect(sql); + result=DBselect(sql); row = DBfetch(result); |