diff options
| author | unknown <serg@serg.mylan> | 2006-01-17 21:12:24 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-17 21:12:24 +0100 |
| commit | d9e7af2684205baebe325fc78d6d34b6ffb727e2 (patch) | |
| tree | 0230407a8363eee64595fbb8e4f19fab0f67e744 /client | |
| parent | 8975c9bb605d6c0a3506acb0f3022eb8246962ec (diff) | |
| parent | e0db2186e43448c9631b2849a95c487963dc39e8 (diff) | |
| download | mariadb-git-d9e7af2684205baebe325fc78d6d34b6ffb727e2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 6a2a7b072de..ca28419fa4f 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2143,19 +2143,8 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host, *create_conn= 0; goto err; } - else - { - handle_no_error(q); - /* - Fail if there was no error but we expected it. - We also don't want to have connection in this case. - */ - mysql_close(con); - *create_conn= 0; - error= 1; - goto err; - } + handle_no_error(q); /* TODO: change this to 0 in future versions, but the 'kill' test relies on |