You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.9 KiB
56 lines
1.9 KiB
From b72503cad0654878841172451b2ea860a59e30c1 Mon Sep 17 00:00:00 2001
|
|
From: Conrad Kostecki <conrad@kostecki.com>
|
|
Date: Tue, 13 Oct 2020 07:34:16 +0200
|
|
Subject: [PATCH] dbd/mysql/statement.c: fix compilation with mysql-8
|
|
|
|
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
|
|
---
|
|
dbd/mysql/dbd_mysql.h | 2 +-
|
|
dbd/mysql/statement.c | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/dbd/mysql/dbd_mysql.h b/dbd/mysql/dbd_mysql.h
|
|
index 233bc35..4777289 100644
|
|
--- a/dbd/mysql/dbd_mysql.h
|
|
+++ b/dbd/mysql/dbd_mysql.h
|
|
@@ -3,7 +3,7 @@
|
|
#endif
|
|
|
|
|
|
-#include <mysql.h>
|
|
+#include <mysql/mysql.h>
|
|
#include <dbd/common.h>
|
|
|
|
#define DBD_MYSQL_CONNECTION "DBD.MySQL.Connection"
|
|
diff --git a/dbd/mysql/statement.c b/dbd/mysql/statement.c
|
|
index aca865a..6af4c39 100644
|
|
--- a/dbd/mysql/statement.c
|
|
+++ b/dbd/mysql/statement.c
|
|
@@ -424,7 +424,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
|
|
|
|
if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) {
|
|
char str[20];
|
|
- struct st_mysql_time *t = bind[i].buffer;
|
|
+ MYSQL_TIME *t = bind[i].buffer;
|
|
|
|
snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second);
|
|
|
|
@@ -435,7 +435,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
|
|
}
|
|
} else if (fields[i].type == MYSQL_TYPE_TIME) {
|
|
char str[9];
|
|
- struct st_mysql_time *t = bind[i].buffer;
|
|
+ MYSQL_TIME *t = bind[i].buffer;
|
|
|
|
snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second);
|
|
|
|
@@ -446,7 +446,7 @@ static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_
|
|
}
|
|
} else if (fields[i].type == MYSQL_TYPE_DATE) {
|
|
char str[20];
|
|
- struct st_mysql_time *t = bind[i].buffer;
|
|
+ MYSQL_TIME *t = bind[i].buffer;
|
|
|
|
snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day);
|
|
|