diff options
| author | konstantin@mysql.com <> | 2006-02-02 16:57:34 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2006-02-02 16:57:34 +0300 |
| commit | 92b41ba92a022e86127481f2f4a90849feb93114 (patch) | |
| tree | 8b45ee033b876bd5d51ce4afe7627ae87815b79c /sql-common/client.c | |
| parent | 065f8066d5de10cf998b02d0e02216f61d87e9db (diff) | |
| parent | 87f685edef5bd97ab8099d0ae6dcf2fa3ddd871b (diff) | |
| download | mariadb-git-92b41ba92a022e86127481f2f4a90849feb93114.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 5d0370d950a..2d826df0662 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -599,7 +599,7 @@ net_safe_read(MYSQL *mysql) DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %d", vio_description(net->vio),len)); #ifdef MYSQL_SERVER - if (vio_was_interrupted(net->vio)) + if (net->vio && vio_was_interrupted(net->vio)) return (packet_error); #endif /*MYSQL_SERVER*/ end_server(mysql); |