diff options
| author | unknown <serg@serg.mylan> | 2006-01-03 18:12:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-03 18:12:03 +0100 |
| commit | c489cdebeabc88b394f04bf1ae91df3deff602da (patch) | |
| tree | cfc5357eb7d1e59ea0163aa88d31bcf7644151d7 /sql-common | |
| parent | 5e7cbbcbbcb871432cf513c89cd5240c754cde29 (diff) | |
| parent | 307c0b77a191a428c4bfdcba42b53872aa7c917f (diff) | |
| download | mariadb-git-c489cdebeabc88b394f04bf1ae91df3deff602da.tar.gz | |
merged
myisam/mi_delete.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.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); |