diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-02 16:26:26 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-02 16:26:26 +0200 |
| commit | 62b38d20ddcf4fb0f519e8b647916d7b367e894c (patch) | |
| tree | d5f028634bcbaae2571568955a56ea1b2b5c266b /sql/sql_parse.cc | |
| parent | ba8ed9315a7dc7f1c8850f9104d5bc5fc052231f (diff) | |
| parent | 8ec8636c41b3e9823fa7222e1dfe4d68fbb9ac76 (diff) | |
| download | mariadb-git-62b38d20ddcf4fb0f519e8b647916d7b367e894c.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/net_serv.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7caf75b6639..0f072a73ac6 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -886,6 +886,12 @@ bool do_command(THD *thd) vio_description(net->vio) )); return TRUE; } + else if (!packet_length) + { + send_error(net,net->last_errno,NullS); + net->error=0; + DBUG_RETURN(FALSE); + } else { packet=(char*) net->read_pos; |