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

Plugin fixes

Browse Source 
- include ma_errmsg.h if plugin is built dynamically
- trace_example fixes
This commit is contained in:
Georg Richter
2016-11-24 08:56:27 +01:00
parent 3e624e50df
commit aabaac04aa
9 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/libmariadb/CMakeLists.txt
View File

@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include
${CC_SOURCE_DIR}/unittest/libmariadb)
ADD_DEFINITIONS(-DLIBMARIADB)
SET(API_TESTS "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "sqlite3" "thread" "features-10_2"
SET(API_TESTS "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "sqlite3" "thread" "features-10_2" "async_example"
"bulk1" )
IF(WITH_DYNCOL)
SET(API_TESTS ${API_TESTS} "dyncol")

2
unittest/libmariadb/bulk1.c
View File

@@ -60,6 +60,8 @@ static int bulk1(MYSQL *mysql)
if (!bulk_enabled)
return SKIP;
rc= mysql_select_db(mysql, "testc");
rc= mysql_query(mysql, "DROP TABLE IF EXISTS bulk1");
check_mysql_rc(rc, mysql);

1
unittest/libmariadb/features-10_2.c
View File

@@ -139,7 +139,6 @@ static int conc_212(MYSQL *mysql)
mysql_stmt_store_result(stmt);
mysql_stmt_free_result(stmt);
sleep(100);
rc= mariadb_stmt_execute_direct(stmt, "SELECT 1, 2", -1);
check_stmt_rc(rc, stmt);
mysql_stmt_store_result(stmt);

2
unittest/libmariadb/misc.c
View File

@@ -979,7 +979,7 @@ static int test_read_timeout(MYSQL *unused __attribute__((unused)))
mysql_options(my, MYSQL_OPT_READ_TIMEOUT, &timeout);
FAIL_IF(!my_test_connect(my, hostname, username, password, schema,
port, socketname, 0), mysql_error(my));
rc= mysql_query(my, "SELECT SLEEP(50)");
FAIL_IF(rc == 0, "error expected");