diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-15 12:07:33 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-15 12:07:33 +0100 |
| commit | 30b17b997fa7a096b2644a3260cf1106e69f1ccc (patch) | |
| tree | ea4a2f8d8db958da25a0c5f8c16d98b39096cdd0 /sql/sql_class.cc | |
| parent | d8babe1ae29065af5fa1c11f16e8db52c280e5ca (diff) | |
| parent | 93e3057ba574672c2f0bb1b0958221c0d7efc553 (diff) | |
| download | mariadb-git-30b17b997fa7a096b2644a3260cf1106e69f1ccc.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858-push
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/union.result:
Bug#32858: Manual merge
mysql-test/t/union.test:
Bug#32858: Manual merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 93f5a34d5c6..e36ed0c425f 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -931,6 +931,7 @@ 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) |