database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Fixed mysql_api methods: On Windows functions need to be declared with

Browse Source 
STDCALL.
Fixed warning in my_context.h
This commit is contained in:
Georg Richter
2015-12-29 20:37:18 +01:00
parent 46a975bd04
commit 5f98f7710a
7 changed files with 140 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/libmariadb/CMakeLists.txt
View File

@@ -57,7 +57,7 @@ IF(WITH_SSL)
ENDIF()
FOREACH(API_TEST ${API_TESTS})
ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c ${CMAKE_SOURCE_DIR}/libmariadb/getopt.c)
TARGET_LINK_LIBRARIES(${API_TEST} mytap libmariadb)
ADD_TEST(${API_TEST} ${EXECUTABLE_OUTPUT_PATH}/${API_TEST})
SET_TESTS_PROPERTIES(${API_TEST} PROPERTIES TIMEOUT 120)

4
unittest/libmariadb/misc.c
View File

@@ -266,7 +266,7 @@ static int test_frm_bug(MYSQL *mysql)
sprintf(test_frm, "%s/%s/test_frm_bug.frm", data_dir, schema);
if (!(test_file= my_fopen(test_frm, (int) (O_RDWR | O_CREAT), MYF(MY_WME))))
if (!(test_file= fopen(test_frm, "rw")))
{
mysql_stmt_close(stmt);
diag("Can't write to file %s -> SKIP", test_frm);
@@ -294,7 +294,7 @@ static int test_frm_bug(MYSQL *mysql)
mysql_free_result(result);
mysql_stmt_close(stmt);
my_fclose(test_file, MYF(0));
fclose(test_file);
mysql_query(mysql, "drop table if exists test_frm_bug");
return OK;
}