TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed/improved MySQL

Browse Source
This commit is contained in:
WolverinDEV 2019-09-05 12:30:07 +02:00
parent de01ee9387
commit 709d2c0f5d
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -39,7 +39,6 @@ resolve_library(LIBRARY_TOM_MATH OFF "${LIBRARY_PATH}/tommath/bui
resolve_library(LIBRARY_TOM_CRYPT OFF "${LIBRARY_PATH}/tomcrypt/libtomcrypt.a") resolve_library(LIBRARY_TOM_CRYPT OFF "${LIBRARY_PATH}/tomcrypt/libtomcrypt.a")
resolve_library(LIBRARY_PATH_BREAKPAD OFF "${LIBRARY_PATH}/breakpad/build/src/client/linux/libbreakpad_client.a") resolve_library(LIBRARY_PATH_BREAKPAD OFF "${LIBRARY_PATH}/breakpad/build/src/client/linux/libbreakpad_client.a")
resolve_library(LIBRARY_PATH_PROTOBUF OFF "${LIBRARY_PATH}/protobuf/build/libprotobuf.a") resolve_library(LIBRARY_PATH_PROTOBUF OFF "${LIBRARY_PATH}/protobuf/build/libprotobuf.a")
resolve_library(LIBRARY_PATH_JDBC OFF "${LIBRARY_PATH}/mysqlconnector/build/jdbc/driver/libmysqlcppconn.so.7" "${LIBRARY_PATH}/mysqlconnector/build/jdbc/libmysqlcppconn.so.7")
resolve_library(LIBRARY_PATH_BORINGSSL_SSL OFF "${LIBRARY_PATH}/boringssl/build/ssl/libssl.so") resolve_library(LIBRARY_PATH_BORINGSSL_SSL OFF "${LIBRARY_PATH}/boringssl/build/ssl/libssl.so")
resolve_library(LIBRARY_PATH_BORINGSSL_CRYPTO OFF "${LIBRARY_PATH}/boringssl/build/crypto/libcrypto.so") resolve_library(LIBRARY_PATH_BORINGSSL_CRYPTO OFF "${LIBRARY_PATH}/boringssl/build/crypto/libcrypto.so")
resolve_library(LIBRARY_PATH_THREAD_POOL OFF "${LIBRARY_PATH}/Thread-Pool/build/libThreadPoolStatic.a") resolve_library(LIBRARY_PATH_THREAD_POOL OFF "${LIBRARY_PATH}/Thread-Pool/build/libThreadPoolStatic.a")

3
server/CMakeLists.txt
View File

@ -274,6 +274,9 @@ target_link_libraries(TeaSpeakServer
${LIBRARY_TOM_CRYPT} ${LIBRARY_TOM_CRYPT}
${LIBRARY_TOM_MATH} ${LIBRARY_TOM_MATH}
mysqlclient.a
z
${LIBRARY_PATH_ED255} ${LIBRARY_PATH_ED255}
) )

1
server/repro/env/libs/libmysqlcppconn.so.7 vendored
View File

@ -1 +0,0 @@
../../../../../libraries/mysqlconnector/build/jdbc/driver/libmysqlcppconn.so.7

2
server/src/manager/SqlDataManager.cpp
View File

@ -442,7 +442,7 @@ bool SqlDataManager::update_permissions(std::string &error) {
query += "IGNORE "; query += "IGNORE ";
else else
query += "OR IGNORE "; query += "OR IGNORE ";
query += "INTO `permissions` (serverId, type, id, channelId, permId, value, grant, flag_skip, flag_negate) "; query += "INTO `permissions` (`serverId`, `type`, `id`, `channelId`, `permId`, `value`, `grant`, `flag_skip`, `flag_negate`) ";
query += string() + "SELECT DISTINCT `permissions`.`serverId`, 0, `groupId`, 0, " query += string() + "SELECT DISTINCT `permissions`.`serverId`, 0, `groupId`, 0, "
+ "'" + permission + "', " + "'" + permission + "', "
+ to_string(value.has_value ? value.value : -2) + ", " + to_string(value.has_value ? value.value : -2) + ", "

2
shared

@ -1 +1 @@
Subproject commit 2052317e6c6feba915bdb64d4c8187ff8479e585 Subproject commit c117799cc9b391ec8072db35bbd0558aba7dff53