diff options
| author | unknown <andrey@lmy004.> | 2006-02-11 09:32:46 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-02-11 09:32:46 +0100 |
| commit | 1f3aec24c0e20e75b320fdea6d27c47aec8d83bb (patch) | |
| tree | 3e924bca944cf48e85c4c54f350673c8864f85c2 /tests | |
| parent | b5236ea789bee0d1a4ffe7fa23194ef04bddcb8d (diff) | |
| parent | 2a098077ca098b1c3bef7deb8cc80e9e5f8b30a8 (diff) | |
| download | mariadb-git-1f3aec24c0e20e75b320fdea6d27c47aec8d83bb.tar.gz | |
Merge lmy004.:/work/mysql-5.0-clean
into lmy004.:/work/mysql-5.1-new-clean
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 85aee1210d1..abe9e424244 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -14708,8 +14708,7 @@ static void test_bug12744() rc= mysql_stmt_prepare(prep_stmt, "SELECT 1", 8); DIE_UNLESS(rc==0); - rc= mysql_kill(mysql, mysql_thread_id(mysql)); - DIE_UNLESS(rc==0); + mysql_close(mysql); if (rc= mysql_stmt_execute(prep_stmt)) { @@ -14727,6 +14726,7 @@ static void test_bug12744() DIE_UNLESS(1==0); } rc= mysql_stmt_close(prep_stmt); + client_connect(0); } /* Bug #16144: mysql_stmt_attr_get type error */ |