diff options
| author | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-07-26 23:53:45 +0530 |
|---|---|---|
| committer | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-07-26 23:53:45 +0530 |
| commit | 0c75ba44fee206ce90ec31faa0aaec8d0d609b6e (patch) | |
| tree | 83029a796049094a284c2ddcefeef09bfc80419a /tests/mysql_client_test.c | |
| parent | fe7a28e7596e4e46357bd009c5a910e1bdb8a40c (diff) | |
| parent | 44cd81da86e41c6ac7114ef8dbd31c738eba095d (diff) | |
| download | mariadb-git-0c75ba44fee206ce90ec31faa0aaec8d0d609b6e.tar.gz | |
Merge from 5.1 to 5.5
Diffstat (limited to 'tests/mysql_client_test.c')
| -rw-r--r-- | tests/mysql_client_test.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 7f07a245187..97ea018b280 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17609,7 +17609,8 @@ static void test_bug43560(void) const char* values[] = {"eins", "zwei", "drei", "viele", NULL}; const char insert_str[] = "INSERT INTO t1 (c2) VALUES (?)"; unsigned long length; - + const unsigned int drop_db= opt_drop_db; + DBUG_ENTER("test_bug43560"); myheader("test_bug43560"); @@ -17674,9 +17675,11 @@ static void test_bug43560(void) rc= mysql_stmt_execute(stmt); DIE_UNLESS(rc && mysql_stmt_errno(stmt) == CR_SERVER_LOST); - client_disconnect(conn, 0); + opt_drop_db= 0; + client_disconnect(conn); rc= mysql_query(mysql, "DROP TABLE t1"); myquery(rc); + opt_drop_db= drop_db; DBUG_VOID_RETURN; } |