diff options
| author | unknown <serg@serg.mylan> | 2006-01-16 18:09:04 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-16 18:09:04 +0100 |
| commit | ad5ac3f8979fffef52a94d3dd69b80eb4e329c30 (patch) | |
| tree | 81989cd779b102c585fd676fa196fdd354da443f /sql-common | |
| parent | a4a906b9716ee2a447bd83996b6abe5482cd0e02 (diff) | |
| parent | e931d813e175630e102bc7b8b60ba4d399c283dd (diff) | |
| download | mariadb-git-ad5ac3f8979fffef52a94d3dd69b80eb4e329c30.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
client/mysqldump.c:
Auto merged
sql/field.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql-common')
| -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 4c2debd41ff..824d3705c23 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); |