summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 2125201026a..59391a333c3 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -950,6 +950,7 @@ bool select_send::send_data(List<Item> &items)
DBUG_RETURN(0);
if (!thd->net.report_error)
DBUG_RETURN(protocol->write());
+ protocol->remove_last_row();
DBUG_RETURN(1);
}
@@ -1981,10 +1982,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
}