diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/mysql_client_fw.c | 8 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 9 |
3 files changed, 11 insertions, 8 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0acad6bf30b..a43caf5b4f3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -34,4 +34,6 @@ FIND_LIBRARY(EVENT_LIBRARY event) IF(HAVE_EVENT_H AND EVENT_LIBRARY) ADD_EXECUTABLE(async_queries async_queries.c) TARGET_LINK_LIBRARIES(async_queries mysqlclient ${EVENT_LIBRARY}) + SET_TARGET_PROPERTIES(async_queries PROPERTIES LINKER_LANGUAGE CXX) + ENDIF() diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c index 90a1ea77a50..6dcfb697dbe 100644 --- a/tests/mysql_client_fw.c +++ b/tests/mysql_client_fw.c @@ -275,7 +275,9 @@ static my_bool check_have_innodb(MYSQL *conn) int rc; my_bool result; - rc= mysql_query(conn, "show variables like 'have_innodb'"); + rc= mysql_query(conn, + "SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') " + "AS `TRUE` FROM information_schema.engines WHERE engine = 'innodb'"); myquery(rc); res= mysql_use_result(conn); DIE_UNLESS(res); @@ -283,7 +285,7 @@ static my_bool check_have_innodb(MYSQL *conn) row= mysql_fetch_row(res); DIE_UNLESS(row); - result= strcmp(row[1], "YES") == 0; + result= strcmp(row[1], "1") == 0; mysql_free_result(res); return result; } @@ -583,7 +585,7 @@ static int my_process_stmt_result(MYSQL_STMT *stmt) return row_count; } - field_count= min(mysql_num_fields(result), MAX_RES_FIELDS); + field_count= MY_MIN(mysql_num_fields(result), MAX_RES_FIELDS); bzero((char*) buffer, sizeof(buffer)); bzero((char*) length, sizeof(length)); diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index a9e4dc8ad2b..509e0e73777 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -6930,7 +6930,7 @@ static void test_set_option() mysql_autocommit(mysql, TRUE); /* LIMIT the rows count to 2 */ - rc= mysql_query(mysql, "SET OPTION SQL_SELECT_LIMIT= 2"); + rc= mysql_query(mysql, "SET SQL_SELECT_LIMIT= 2"); myquery(rc); rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_limit"); @@ -6971,7 +6971,7 @@ static void test_set_option() /* RESET the LIMIT the rows count to 0 */ if (!opt_silent) fprintf(stdout, "\n with SQL_SELECT_LIMIT=DEFAULT (prepare)"); - rc= mysql_query(mysql, "SET OPTION SQL_SELECT_LIMIT=DEFAULT"); + rc= mysql_query(mysql, "SET SQL_SELECT_LIMIT=DEFAULT"); myquery(rc); stmt= mysql_simple_prepare(mysql, "SELECT * FROM test_limit"); @@ -17344,11 +17344,10 @@ static void test_wl4166_3() rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); /* - Sic: only one warning, instead of two. The warning - about data truncation when assigning a parameter is lost. + The warning about data truncation when assigning a parameter is lost. This is a bug. */ - my_process_warnings(mysql, 1); + my_process_warnings(mysql, 0); verify_col_data("t1", "year", "0000-00-00 00:00:00"); |