diff options
| author | monty@nosik.monty.fi <> | 2006-11-27 14:07:52 +0200 |
|---|---|---|
| committer | monty@nosik.monty.fi <> | 2006-11-27 14:07:52 +0200 |
| commit | 313f23a93af801ca368fd5f3123f952ab2b8da68 (patch) | |
| tree | 854da1ac89162145e99744fab50d0ea2da4045ed /tests | |
| parent | e394d254fb4c7d93279c55b7762898ddc0629dd3 (diff) | |
| parent | becf45cd8e5195047a77379175cad4c154f04ada (diff) | |
| download | mariadb-git-313f23a93af801ca368fd5f3123f952ab2b8da68.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
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 ce3f9370da2..56b665b098e 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -13695,7 +13695,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); @@ -14837,6 +14838,8 @@ static void test_opt_reconnect() } +#ifndef EMBEDDED_LIBRARY + static void test_bug12744() { MYSQL_STMT *prep_stmt = NULL; @@ -14868,6 +14871,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() |