diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /tests | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/mysql_client_fw.c | 2 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 5 |
3 files changed, 5 insertions, 4 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..eb88be5c0e8 100644 --- a/tests/mysql_client_fw.c +++ b/tests/mysql_client_fw.c @@ -583,7 +583,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 e4454fb8e41..1a653d1072d 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17342,11 +17342,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"); |