database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb

Browse Source
This commit is contained in:
holyfoot@mysql.com
2006-01-04 14:28:41 +04:00
parent a410de984a e8697cf428
commit 42dd692212
46 changed files with 1031 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@ -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
}