summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-16 11:33:54 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-16 11:33:54 +0300
commit13348d3769735c4ed23df263e9c00e42d7a08aca (patch)
tree765dbf44bc16c28e3d63a3439bed89b86e4b92fc /sql/sql_class.cc
parent58b24720b65ff817f5dd587922eb678a8473895a (diff)
parentbd1f8f5bfaf9748ca445401687cca97a89e0dfee (diff)
downloadmariadb-git-13348d3769735c4ed23df263e9c00e42d7a08aca.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index d42a06b3811..aa647aada60 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1616,7 +1616,6 @@ void THD::rollback_item_tree_changes()
select_result::select_result()
{
thd=current_thd;
- nest_level= -1;
}
void select_result::send_error(uint errcode,const char *err)