summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2010-02-22 16:58:56 +0000
committerTatiana A. Nurnberg <azundris@mysql.com>2010-02-22 16:58:56 +0000
commitdad7b3c55e2f4da0d3b03e561bea20153b03a720 (patch)
treef05f0f42b9c1d3478e2f9d5adc66deed7585176d /sql/sql_class.cc
parent7d8bed112c7ddb59b134102f36999dedce370823 (diff)
downloadmariadb-git-dad7b3c55e2f4da0d3b03e561bea20153b03a720.tar.gz
revert 48525
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 266064f9f08..673fc9b78e6 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3100,7 +3100,6 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
}
#endif
- backup->count_cuted_fields= count_cuted_fields;
backup->options= options;
backup->in_sub_stmt= in_sub_stmt;
backup->enable_slow_log= enable_slow_log;
@@ -3138,7 +3137,6 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
void THD::restore_sub_statement_state(Sub_statement_state *backup)
{
- DBUG_ENTER("THD::restore_sub_statement_state");
#ifndef EMBEDDED_LIBRARY
/* BUG#33029, if we are replicating from a buggy master, restore
auto_inc_intervals_forced so that the top statement can use the
@@ -3165,7 +3163,6 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
/* ha_release_savepoint() never returns error. */
(void)ha_release_savepoint(this, sv);
}
- count_cuted_fields= backup->count_cuted_fields;
transaction.savepoints= backup->savepoints;
options= backup->options;
in_sub_stmt= backup->in_sub_stmt;
@@ -3195,7 +3192,6 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
*/
examined_row_count+= backup->examined_row_count;
cuted_fields+= backup->cuted_fields;
- DBUG_VOID_RETURN;
}