Skip to content

Commit 58465fe

Browse files
committed
refactor: replace mysql with mariadb-connector-c
1 parent 55743a3 commit 58465fe

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/legacy/legacyapi/db/impl/mysql/Session.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include "legacyapi/db/Session.h"
3-
#include <mysql.h>
3+
#include <mariadb/mysql.h>
44

55
namespace DB {
66

src/legacy/legacyapi/db/impl/mysql/Stmt.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "lse/Entry.h"
22
#include "legacyapi/db/impl/mysql/Stmt.h"
3-
43
#include "legacyapi/db/impl/mysql/Session.h"
54
#include "legacyapi/utils/StringReader.h"
65
#include "ll/api/io/Logger.h"

src/legacy/legacyapi/db/impl/mysql/Stmt.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22
#include "legacyapi/db/Stmt.h"
3-
#include <mysql.h>
3+
#include <mariadb/mysql.h>
44

55
namespace DB {
66

@@ -10,9 +10,9 @@ struct Receiver {
1010
MYSQL_FIELD field;
1111
std::shared_ptr<char[]> buffer;
1212
unsigned long length = 0;
13-
bool isNull = false;
13+
my_bool isNull = false;
1414
bool isUnsigned = false;
15-
bool error = false;
15+
my_bool error = false;
1616
};
1717

1818
class MySQLStmt : public Stmt {

xmake.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ add_requires(
2323
"simpleini",
2424
"sqlite3 3.43.0+200",
2525
"toml++",
26-
"mysql 8.0.39"
26+
"mariadb-connector-c 3.3.9"
2727
)
28-
add_requires("openssl 1.1.1-w", {configs = {shared = false}})
29-
add_requires("cpp-httplib 0.14.3", {configs = {ssl = true}})
28+
add_requires("cpp-httplib 0.14.3", {configs = {ssl = true, zlib = true}})
3029

3130
if is_config("backend", "lua") then
3231
add_requires("scriptx main", {configs={backend="Lua"}})
@@ -81,7 +80,7 @@ target("legacy-script-engine")
8180
"simpleini",
8281
"sqlite3",
8382
"toml++",
84-
"mysql"
83+
"mariadb-connector-c"
8584
)
8685
set_exceptions("none")
8786
set_kind("shared")

0 commit comments

Comments
 (0)