diff options
| author | unknown <holyfoot@mysql.com> | 2006-01-04 14:28:41 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-01-04 14:28:41 +0400 |
| commit | c000e8a11cb8943236a84918718764afb680cfbe (patch) | |
| tree | f0b1730b1c7ac39bb410c00d2b15f767b54ae083 /sql/sql_class.cc | |
| parent | 1aacfd4fb425eb933b2f9d52b0bf373f370370ca (diff) | |
| parent | 6b27acbdf41dd3c990af4627ddaf8fbfcd8eb4e6 (diff) | |
| download | mariadb-git-c000e8a11cb8943236a84918718764afb680cfbe.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/t/backup.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 7c6f61d6edc..a6512f2c314 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -958,7 +958,9 @@ bool select_send::send_data(List<Item> &items) thd->sent_row_count++; if (!thd->vio_ok()) DBUG_RETURN(0); - if (!thd->net.report_error) + if (thd->net.report_error) + protocol->remove_last_row(); + else DBUG_RETURN(protocol->write()); DBUG_RETURN(1); } @@ -1990,10 +1992,8 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup, cuted_fields= 0; transaction.savepoints= 0; -#ifndef EMBEDDED_LIBRARY /* Surpress OK packets in case if we will execute statements */ net.no_send_ok= TRUE; -#endif } |