hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop merge

Browse Source 
Develop merge
This commit is contained in:
MassimilianoPinto
2017-06-29 15:34:22 +02:00
parent 4993fd683c
commit cb57e10761
122 changed files with 16937 additions and 1627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/protocol/MySQL/test/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_executable(test_parse_kill test_parse_kill.c)
add_executable(test_parse_kill test_parse_kill.cc)
target_link_libraries(test_parse_kill maxscale-common MySQLCommon)
add_test(test_parse_kill test_parse_kill)

8
server/modules/protocol/MySQL/test/test_parse_kill.c → server/modules/protocol/MySQL/test/test_parse_kill.cc
View File

@ -1,8 +1,8 @@
#include <maxscale/cdefs.h>
#include "../MySQLClient/mysql_client.c"
#include "../MySQLClient/mysql_client.cc"
int test_one_query(char *query, bool should_succeed, uint64_t expected_tid,
int test_one_query(const char *query, bool should_succeed, uint64_t expected_tid,
kill_type_t expected_kt)
{
char *query_copy = MXS_STRDUP_A(query);
@ -46,7 +46,7 @@ int test_one_query(char *query, bool should_succeed, uint64_t expected_tid,
}
typedef struct test_t
{
char *query;
const char *query;
bool should_succeed;
uint64_t correct_id;
kill_type_t correct_kt;
@ -79,7 +79,7 @@ int main(int argc, char **argv)
int arr_size = sizeof(tests) / sizeof(test_t);
for (int i = 0; i < arr_size; i++)
{
char *query = tests[i].query;
const char *query = tests[i].query;
bool should_succeed = tests[i].should_succeed;
uint64_t expected_tid = tests[i].correct_id;
kill_type_t expected_kt = tests[i].correct_kt;