diff options
| author | kostja@bodhi.local <> | 2006-11-29 02:44:12 +0300 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-11-29 02:44:12 +0300 |
| commit | 5fea0724bc46684390cfd9311dc8f854ece2bc9b (patch) | |
| tree | f9f728e4fd94cdcf8bc3f5ea8270ee291aa94890 /tests | |
| parent | ea47e05f3cc5929eb1f56cfdc094cedfce318499 (diff) | |
| parent | 3406fcea39defef5d5cd92f99fa4e60d556f3dae (diff) | |
| download | mariadb-git-5fea0724bc46684390cfd9311dc8f854ece2bc9b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index c88252e6190..c596a589d55 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -13686,7 +13686,8 @@ static void test_bug11172() hired.year, hired.month, hired.day); } DIE_UNLESS(rc == MYSQL_NO_DATA); - mysql_stmt_free_result(stmt) || mysql_stmt_reset(stmt); + if (!mysql_stmt_free_result(stmt)) + mysql_stmt_reset(stmt); } mysql_stmt_close(stmt); mysql_rollback(mysql); @@ -14828,6 +14829,8 @@ static void test_opt_reconnect() } +#ifndef EMBEDDED_LIBRARY + static void test_bug12744() { MYSQL_STMT *prep_stmt = NULL; @@ -14859,6 +14862,8 @@ static void test_bug12744() client_connect(0); } +#endif /* EMBEDDED_LIBRARY */ + /* Bug #16143: mysql_stmt_sqlstate returns an empty string instead of '00000' */ static void test_bug16143() |