diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /vio/viossl.c | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index ab1f217748d..356fca40d13 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -161,8 +161,6 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d ctx: 0x%lx", (long) ptr, vio->sd, (long) ptr->ssl_context)); - error_string[0]= 0; - /* Set socket to blocking if not already set */ vio_blocking(vio, 1, &was_blocking); |