diff options
| author | unknown <holyfoot@mysql.com> | 2006-01-19 18:05:57 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-01-19 18:05:57 +0400 |
| commit | d07932a3f19aa5bbaf50ea40aca9ad5cce5abb54 (patch) | |
| tree | 0c5df31a98305c1cfd75da28b7efa727365ffeef /sql/sql_class.cc | |
| parent | 098af0ae1aae693829f0c9daef551f2c3571c476 (diff) | |
| parent | 6731dd6380e19cc589cab89bd941fc36210c28ac (diff) | |
| download | mariadb-git-d07932a3f19aa5bbaf50ea40aca9ad5cce5abb54.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.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 3d5c9ac79b6..c6b6fccd524 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -963,7 +963,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); } @@ -2014,10 +2016,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 } |